Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
f0e303b0
Commit
f0e303b0
authored
May 26, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
May 26, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Add the output signature to IWineD3DDevice_CreateVertexShader().
parent
2153b4d9
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
4 deletions
+10
-4
device.c
dlls/d3d8/device.c
+1
-1
vertexshader.c
dlls/d3d9/vertexshader.c
+2
-1
device.c
dlls/wined3d/device.c
+6
-2
wined3d.idl
include/wine/wined3d.idl
+1
-0
No files found.
dlls/d3d8/device.c
View file @
f0e303b0
...
...
@@ -1789,7 +1789,7 @@ static HRESULT WINAPI IDirect3DDevice8Impl_CreateVertexShader(LPDIRECT3DDEVICE8
{
/* Usage is missing ... Use SetRenderState to set the sw vp render state in SetVertexShader */
hrc
=
IWineD3DDevice_CreateVertexShader
(
This
->
WineD3DDevice
,
wined3d_vertex_declaration
,
pFunction
,
&
object
->
wineD3DVertexShader
,
(
IUnknown
*
)
object
);
pFunction
,
NULL
/* output signature */
,
&
object
->
wineD3DVertexShader
,
(
IUnknown
*
)
object
);
if
(
FAILED
(
hrc
))
{
...
...
dlls/d3d9/vertexshader.c
View file @
f0e303b0
...
...
@@ -126,7 +126,8 @@ HRESULT WINAPI IDirect3DDevice9Impl_CreateVertexShader(LPDIRECT3DDEVICE9EX iface
object
->
ref
=
1
;
object
->
lpVtbl
=
&
Direct3DVertexShader9_Vtbl
;
EnterCriticalSection
(
&
d3d9_cs
);
hrc
=
IWineD3DDevice_CreateVertexShader
(
This
->
WineD3DDevice
,
NULL
/* declaration */
,
pFunction
,
&
object
->
wineD3DVertexShader
,
(
IUnknown
*
)
object
);
hrc
=
IWineD3DDevice_CreateVertexShader
(
This
->
WineD3DDevice
,
NULL
/* declaration */
,
pFunction
,
NULL
/* output signature */
,
&
object
->
wineD3DVertexShader
,
(
IUnknown
*
)
object
);
LeaveCriticalSection
(
&
d3d9_cs
);
if
(
FAILED
(
hrc
))
{
...
...
dlls/wined3d/device.c
View file @
f0e303b0
...
...
@@ -2328,7 +2328,11 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexDeclarationFromFVF(IWineD3D
return
WINED3D_OK
;
}
static
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateVertexShader
(
IWineD3DDevice
*
iface
,
IWineD3DVertexDeclaration
*
vertex_declaration
,
CONST
DWORD
*
pFunction
,
IWineD3DVertexShader
**
ppVertexShader
,
IUnknown
*
parent
)
{
static
HRESULT
WINAPI
IWineD3DDeviceImpl_CreateVertexShader
(
IWineD3DDevice
*
iface
,
IWineD3DVertexDeclaration
*
vertex_declaration
,
const
DWORD
*
pFunction
,
const
struct
wined3d_shader_signature
*
output_signature
,
IWineD3DVertexShader
**
ppVertexShader
,
IUnknown
*
parent
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
IWineD3DVertexShaderImpl
*
object
;
/* NOTE: impl usage is ok, this is a create */
HRESULT
hr
=
WINED3D_OK
;
...
...
@@ -2355,7 +2359,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexShader(IWineD3DDevice *ifac
IWineD3DVertexShader_FakeSemantics
(
*
ppVertexShader
,
vertex_declaration
);
}
hr
=
IWineD3DVertexShader_SetFunction
(
*
ppVertexShader
,
pFunction
,
NULL
);
hr
=
IWineD3DVertexShader_SetFunction
(
*
ppVertexShader
,
pFunction
,
output_signature
);
if
(
FAILED
(
hr
))
{
WARN
(
"(%p) : Failed to set function, returning %#x
\n
"
,
iface
,
hr
);
...
...
include/wine/wined3d.idl
View file @
f0e303b0
...
...
@@ -3013,6 +3013,7 @@ interface IWineD3DDevice : IWineD3DBase
HRESULT
CreateVertexShader
(
[
in
]
IWineD3DVertexDeclaration
*
declaration
,
[
in
]
const
DWORD
*
function
,
[
in
]
const
struct
wined3d_shader_signature
*
output_signature
,
[
out
]
IWineD3DVertexShader
**
shader
,
[
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