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
d73e5d6f
Commit
d73e5d6f
authored
Jan 06, 2007
by
H. Verbeet
Committed by
Alexandre Julliard
Jan 08, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: IDirect3DDevice8Impl_GetVertexShaderDeclaration gets passed a handle instead of a pointer.
parent
6e3b732f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
19 additions
and
3 deletions
+19
-3
device.c
dlls/d3d8/device.c
+19
-3
No files found.
dlls/d3d8/device.c
View file @
d73e5d6f
...
...
@@ -1290,13 +1290,29 @@ static HRESULT WINAPI IDirect3DDevice8Impl_GetVertexShaderConstant(LPDIRECT3DDEV
return
IWineD3DDevice_GetVertexShaderConstantF
(
This
->
WineD3DDevice
,
Register
,
(
float
*
)
pConstantData
,
ConstantCount
);
}
/* FIXME: There currently isn't a proper way to retrieve the declaration from
* the wined3d shader. However, rather than simply adding this, the relation
* between d3d8 and wined3d shaders should be fixed. A d3d8 vertex shader
* should contain both a wined3d vertex shader and a wined3d vertex
* declaration, and eg. SetVertexShader in d3d8 should set both of them in
* wined3d. This would also allow us to get rid of the vertexDeclaration field
* in IWineD3DVertexShaderImpl */
static
HRESULT
WINAPI
IDirect3DDevice8Impl_GetVertexShaderDeclaration
(
LPDIRECT3DDEVICE8
iface
,
DWORD
pVertexShader
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DVertexShader8Impl
*
This
=
(
IDirect3DVertexShader8Impl
*
)
pVertexShader
;
IDirect3DDevice8Impl
*
This
=
(
IDirect3DDevice8Impl
*
)
iface
;
IDirect3DVertexShader8Impl
*
shader
=
NULL
;
TRACE
(
"(%p) : Relay
\n
"
,
This
);
/* return IWineD3DVertexShader_GetDeclaration(This->wineD3DVertexShader, pData, (UINT *)pSizeOfData); */
TRACE
(
"(%p) : pVertexShader %#x, pData %p, pSizeOfData %p
\n
"
,
This
,
pVertexShader
,
pData
,
pSizeOfData
);
if
(
pVertexShader
<=
VS_HIGHESTFIXEDFXF
||
This
->
allocated_shader_handles
<=
pVertexShader
-
(
VS_HIGHESTFIXEDFXF
+
1
))
{
ERR
(
"Passed an invalid shader handle.
\n
"
);
return
D3DERR_INVALIDCALL
;
}
shader
=
This
->
shader_handles
[
pVertexShader
-
(
VS_HIGHESTFIXEDFXF
+
1
)];
FIXME
(
"Unimplemented, returning D3DERR_INVALIDCALL
\n
"
);
return
D3DERR_INVALIDCALL
;
}
static
HRESULT
WINAPI
IDirect3DDevice8Impl_GetVertexShaderFunction
(
LPDIRECT3DDEVICE8
iface
,
DWORD
pVertexShader
,
void
*
pData
,
DWORD
*
pSizeOfData
)
{
IDirect3DDevice8Impl
*
This
=
(
IDirect3DDevice8Impl
*
)
iface
;
IDirect3DVertexShader8Impl
*
shader
=
NULL
;
...
...
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