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
81ed6e0c
Commit
81ed6e0c
authored
Apr 12, 2012
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 13, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Use the wined3d declaration to retrieve the FVF in IDirect3DDevice9Impl_GetFVF().
parent
b48f394e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
12 deletions
+17
-12
device.c
dlls/d3d9/device.c
+17
-12
No files found.
dlls/d3d9/device.c
View file @
81ed6e0c
...
...
@@ -2236,32 +2236,37 @@ static HRESULT WINAPI IDirect3DDevice9Impl_SetFVF(IDirect3DDevice9Ex *iface, DWO
return
hr
;
}
static
HRESULT
WINAPI
IDirect3DDevice9Impl_GetFVF
(
IDirect3DDevice9Ex
*
iface
,
DWORD
*
pFVF
)
static
HRESULT
WINAPI
IDirect3DDevice9Impl_GetFVF
(
IDirect3DDevice9Ex
*
iface
,
DWORD
*
fvf
)
{
IDirect3DVertexDeclaration9
*
decl
;
IDirect3DDevice9Impl
*
device
=
impl_from_IDirect3DDevice9Ex
(
iface
);
struct
wined3d_vertex_declaration
*
wined3d_declaration
;
IDirect3DVertexDeclaration9Impl
*
d3d9_declaration
;
HRESULT
hr
;
TRACE
(
"iface %p, fvf %p.
\n
"
,
iface
,
pFVF
);
TRACE
(
"iface %p, fvf %p.
\n
"
,
iface
,
fvf
);
hr
=
IDirect3DDevice9_GetVertexDeclaration
(
iface
,
&
decl
);
if
(
FAILED
(
hr
))
wined3d_mutex_lock
(
);
if
(
FAILED
(
hr
=
wined3d_device_get_vertex_declaration
(
device
->
wined3d_device
,
&
wined3d_declaration
)
))
{
WARN
(
"Failed to get vertex declaration, %#x
\n
"
,
hr
);
*
pFVF
=
0
;
wined3d_mutex_unlock
();
WARN
(
"Failed to get vertex declaration, hr %#x.
\n
"
,
hr
);
*
fvf
=
0
;
return
hr
;
}
if
(
decl
)
if
(
wined3d_declaration
)
{
*
pFVF
=
((
IDirect3DVertexDeclaration9Impl
*
)
decl
)
->
convFVF
;
IDirect3DVertexDeclaration9_Release
(
decl
);
d3d9_declaration
=
wined3d_vertex_declaration_get_parent
(
wined3d_declaration
);
*
fvf
=
d3d9_declaration
->
convFVF
;
wined3d_vertex_declaration_decref
(
wined3d_declaration
);
}
else
{
*
pFVF
=
0
;
*
fvf
=
0
;
}
wined3d_mutex_unlock
();
TRACE
(
"Returning FVF %#x
\n
"
,
*
pFVF
);
TRACE
(
"Returning FVF %#x
.
\n
"
,
*
fvf
);
return
hr
;
}
...
...
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