Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
67cba487
Commit
67cba487
authored
Dec 29, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Dec 30, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: The FVF parameter to IWineD3DDeviceImpl_CreateVertexBuffer() is unused now.
parent
9a81b032
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
8 additions
and
10 deletions
+8
-10
vertexbuffer.c
dlls/d3d8/vertexbuffer.c
+1
-2
vertexbuffer.c
dlls/d3d9/vertexbuffer.c
+1
-2
direct3d.c
dlls/ddraw/direct3d.c
+1
-2
device.c
dlls/wined3d/device.c
+5
-3
wined3d.idl
include/wine/wined3d.idl
+0
-1
No files found.
dlls/d3d8/vertexbuffer.c
View file @
67cba487
...
...
@@ -272,8 +272,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer8Impl *buffer, IDirect3DDevice8Im
wined3d_mutex_lock
();
hr
=
IWineD3DDevice_CreateVertexBuffer
(
device
->
WineD3DDevice
,
size
,
usage
&
WINED3DUSAGE_MASK
,
0
,
(
WINED3DPOOL
)
pool
,
&
buffer
->
wineD3DVertexBuffer
,
usage
&
WINED3DUSAGE_MASK
,
(
WINED3DPOOL
)
pool
,
&
buffer
->
wineD3DVertexBuffer
,
(
IUnknown
*
)
buffer
,
&
d3d8_vertexbuffer_wined3d_parent_ops
);
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
...
...
dlls/d3d9/vertexbuffer.c
View file @
67cba487
...
...
@@ -273,8 +273,7 @@ HRESULT vertexbuffer_init(IDirect3DVertexBuffer9Impl *buffer, IDirect3DDevice9Im
wined3d_mutex_lock
();
hr
=
IWineD3DDevice_CreateVertexBuffer
(
device
->
WineD3DDevice
,
size
,
usage
&
WINED3DUSAGE_MASK
,
0
,
(
WINED3DPOOL
)
pool
,
&
buffer
->
wineD3DVertexBuffer
,
usage
&
WINED3DUSAGE_MASK
,
(
WINED3DPOOL
)
pool
,
&
buffer
->
wineD3DVertexBuffer
,
(
IUnknown
*
)
buffer
,
&
d3d9_vertexbuffer_wined3d_parent_ops
);
wined3d_mutex_unlock
();
if
(
FAILED
(
hr
))
...
...
dlls/ddraw/direct3d.c
View file @
67cba487
...
...
@@ -1016,8 +1016,7 @@ IDirect3DImpl_7_CreateVertexBuffer(IDirect3D7 *iface,
EnterCriticalSection
(
&
ddraw_cs
);
hr
=
IWineD3DDevice_CreateVertexBuffer
(
This
->
wineD3DDevice
,
get_flexible_vertex_size
(
Desc
->
dwFVF
)
*
Desc
->
dwNumVertices
,
usage
,
Desc
->
dwFVF
,
Desc
->
dwCaps
&
D3DVBCAPS_SYSTEMMEMORY
?
WINED3DPOOL_SYSTEMMEM
:
WINED3DPOOL_DEFAULT
,
usage
,
Desc
->
dwCaps
&
D3DVBCAPS_SYSTEMMEMORY
?
WINED3DPOOL_SYSTEMMEM
:
WINED3DPOOL_DEFAULT
,
&
object
->
wineD3DVertexBuffer
,
(
IUnknown
*
)
object
,
&
ddraw_null_wined3d_parent_ops
);
if
(
hr
!=
D3D_OK
)
{
...
...
dlls/wined3d/device.c
View file @
67cba487
...
...
@@ -479,14 +479,17 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateBuffer(IWineD3DDevice *iface, str
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateVertexBuffer
(
IWineD3DDevice
*
iface
,
UINT
Size
,
DWORD
Usage
,
DWORD
FVF
,
WINED3DPOOL
Pool
,
IWineD3DBuffer
**
ppVertexBuffer
,
static
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateVertexBuffer
(
IWineD3DDevice
*
iface
,
UINT
Size
,
DWORD
Usage
,
WINED3DPOOL
Pool
,
IWineD3DBuffer
**
ppVertexBuffer
,
IUnknown
*
parent
,
const
struct
wined3d_parent_ops
*
parent_ops
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
struct
wined3d_buffer
*
object
;
HRESULT
hr
;
TRACE
(
"iface %p, size %u, usage %#x, pool %#x, buffer %p, parent %p, parent_ops %p.
\n
"
,
iface
,
Size
,
Usage
,
Pool
,
ppVertexBuffer
,
parent
,
parent_ops
);
if
(
Pool
==
WINED3DPOOL_SCRATCH
)
{
/* The d3d9 testsuit shows that this is not allowed. It doesn't make much sense
...
...
@@ -515,7 +518,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac
}
TRACE
(
"Created buffer %p.
\n
"
,
object
);
TRACE
(
"FVF %#x, Pool %#x.
\n
"
,
FVF
,
Pool
);
*
ppVertexBuffer
=
(
IWineD3DBuffer
*
)
object
;
/* Observations show that drawStridedSlow is faster on dynamic VBs than converting +
...
...
include/wine/wined3d.idl
View file @
67cba487
...
...
@@ -2867,7 +2867,6 @@ interface IWineD3DDevice : IWineD3DBase
HRESULT
CreateVertexBuffer
(
[
in
]
UINT
length
,
[
in
]
DWORD
usage
,
[
in
]
DWORD
fvf
,
[
in
]
WINED3DPOOL
pool
,
[
out
]
IWineD3DBuffer
**
vertex_buffer
,
[
in
]
IUnknown
*
parent
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment