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
6e7d3702
Commit
6e7d3702
authored
Aug 26, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 26, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Rename "wineD3DVertexDeclaration" to "wined3d_declaration".
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d2b782f4
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
8 deletions
+7
-8
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-1
device.c
dlls/ddraw/device.c
+2
-2
vertexbuffer.c
dlls/ddraw/vertexbuffer.c
+4
-5
No files found.
dlls/ddraw/ddraw_private.h
View file @
6e7d3702
...
...
@@ -553,7 +553,7 @@ struct d3d_vertex_buffer
/*** WineD3D and ddraw links ***/
struct
wined3d_buffer
*
wined3d_buffer
;
struct
wined3d_vertex_declaration
*
wine
D3DVertexD
eclaration
;
struct
wined3d_vertex_declaration
*
wine
d3d_d
eclaration
;
struct
ddraw
*
ddraw
;
/*** Storage for D3D7 specific things ***/
...
...
dlls/ddraw/device.c
View file @
6e7d3702
...
...
@@ -4276,7 +4276,7 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE
stride
=
get_flexible_vertex_size
(
vb_impl
->
fvf
);
wined3d_mutex_lock
();
wined3d_device_set_vertex_declaration
(
device
->
wined3d_device
,
vb_impl
->
wine
D3DVertexD
eclaration
);
wined3d_device_set_vertex_declaration
(
device
->
wined3d_device
,
vb_impl
->
wine
d3d_d
eclaration
);
if
(
FAILED
(
hr
=
wined3d_device_set_stream_source
(
device
->
wined3d_device
,
0
,
vb_impl
->
wined3d_buffer
,
0
,
stride
)))
{
...
...
@@ -4375,7 +4375,7 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface,
wined3d_mutex_lock
();
wined3d_device_set_vertex_declaration
(
device
->
wined3d_device
,
vb_impl
->
wine
D3DVertexD
eclaration
);
wined3d_device_set_vertex_declaration
(
device
->
wined3d_device
,
vb_impl
->
wine
d3d_d
eclaration
);
hr
=
d3d_device_prepare_index_buffer
(
device
,
index_count
*
sizeof
(
WORD
));
if
(
FAILED
(
hr
))
...
...
dlls/ddraw/vertexbuffer.c
View file @
6e7d3702
...
...
@@ -158,7 +158,7 @@ static ULONG WINAPI d3d_vertex_buffer7_Release(IDirect3DVertexBuffer7 *iface)
if
(
curVB
==
buffer
->
wined3d_buffer
)
wined3d_device_set_stream_source
(
buffer
->
ddraw
->
wined3d_device
,
0
,
NULL
,
0
,
0
);
wined3d_vertex_declaration_decref
(
buffer
->
wine
D3DVertexD
eclaration
);
wined3d_vertex_declaration_decref
(
buffer
->
wine
d3d_d
eclaration
);
wined3d_buffer_decref
(
buffer
->
wined3d_buffer
);
wined3d_mutex_unlock
();
...
...
@@ -383,7 +383,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_ProcessVertices(IDirect3DVertexBuffer7
wined3d_device_set_stream_source
(
device_impl
->
wined3d_device
,
0
,
src_buffer_impl
->
wined3d_buffer
,
0
,
get_flexible_vertex_size
(
src_buffer_impl
->
fvf
));
wined3d_device_set_vertex_declaration
(
device_impl
->
wined3d_device
,
src_buffer_impl
->
wine
D3DVertexD
eclaration
);
wined3d_device_set_vertex_declaration
(
device_impl
->
wined3d_device
,
src_buffer_impl
->
wine
d3d_d
eclaration
);
hr
=
wined3d_device_process_vertices
(
device_impl
->
wined3d_device
,
src_idx
,
dst_idx
,
count
,
dst_buffer_impl
->
wined3d_buffer
,
NULL
,
flags
,
dst_buffer_impl
->
fvf
);
...
...
@@ -603,15 +603,14 @@ HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **vertex_buf,
goto
end
;
}
buffer
->
wineD3DVertexDeclaration
=
ddraw_find_decl
(
ddraw
,
desc
->
dwFVF
);
if
(
!
buffer
->
wineD3DVertexDeclaration
)
if
(
!
(
buffer
->
wined3d_declaration
=
ddraw_find_decl
(
ddraw
,
desc
->
dwFVF
)))
{
ERR
(
"Failed to find vertex declaration for fvf %#x.
\n
"
,
desc
->
dwFVF
);
wined3d_buffer_decref
(
buffer
->
wined3d_buffer
);
hr
=
DDERR_INVALIDPARAMS
;
goto
end
;
}
wined3d_vertex_declaration_incref
(
buffer
->
wine
D3DVertexD
eclaration
);
wined3d_vertex_declaration_incref
(
buffer
->
wine
d3d_d
eclaration
);
end:
wined3d_mutex_unlock
();
...
...
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