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
27723aff
Commit
27723aff
authored
Sep 25, 2009
by
Henri Verbeet
Committed by
Alexandre Julliard
Sep 25, 2009
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d8: Set the vertex declaration's shader handle in vertexdeclaration_init().
parent
d0aaae99
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
d3d8_private.h
dlls/d3d8/d3d8_private.h
+1
-1
vertexdeclaration.c
dlls/d3d8/vertexdeclaration.c
+2
-1
vertexshader.c
dlls/d3d8/vertexshader.c
+1
-3
No files found.
dlls/d3d8/d3d8_private.h
View file @
27723aff
...
...
@@ -542,7 +542,7 @@ typedef struct {
}
IDirect3DVertexDeclaration8Impl
;
HRESULT
vertexdeclaration_init
(
IDirect3DVertexDeclaration8Impl
*
declaration
,
IDirect3DDevice8Impl
*
device
,
const
DWORD
*
elements
)
DECLSPEC_HIDDEN
;
IDirect3DDevice8Impl
*
device
,
const
DWORD
*
elements
,
DWORD
shader_handle
)
DECLSPEC_HIDDEN
;
HRESULT
vertexdeclaration_init_fvf
(
IDirect3DVertexDeclaration8Impl
*
declaration
,
IDirect3DDevice8Impl
*
device
,
DWORD
fvf
)
DECLSPEC_HIDDEN
;
...
...
dlls/d3d8/vertexdeclaration.c
View file @
27723aff
...
...
@@ -376,7 +376,7 @@ static const struct wined3d_parent_ops d3d8_vertexdeclaration_wined3d_parent_ops
};
HRESULT
vertexdeclaration_init
(
IDirect3DVertexDeclaration8Impl
*
declaration
,
IDirect3DDevice8Impl
*
device
,
const
DWORD
*
elements
)
IDirect3DDevice8Impl
*
device
,
const
DWORD
*
elements
,
DWORD
shader_handle
)
{
WINED3DVERTEXELEMENT
*
wined3d_elements
;
UINT
wined3d_element_count
;
...
...
@@ -384,6 +384,7 @@ HRESULT vertexdeclaration_init(IDirect3DVertexDeclaration8Impl *declaration,
declaration
->
lpVtbl
=
&
Direct3DVertexDeclaration8_Vtbl
;
declaration
->
ref_count
=
1
;
declaration
->
shader_handle
=
shader_handle
;
wined3d_element_count
=
convert_to_wined3d_declaration
(
elements
,
&
declaration
->
elements_size
,
&
wined3d_elements
);
declaration
->
elements
=
HeapAlloc
(
GetProcessHeap
(),
0
,
declaration
->
elements_size
);
...
...
dlls/d3d8/vertexshader.c
View file @
27723aff
...
...
@@ -113,7 +113,7 @@ static HRESULT vertexshader_create_vertexdeclaration(IDirect3DDevice8Impl *devic
return
D3DERR_OUTOFVIDEOMEMORY
;
}
hr
=
vertexdeclaration_init
(
object
,
device
,
declaration
);
hr
=
vertexdeclaration_init
(
object
,
device
,
declaration
,
shader_handle
);
if
(
FAILED
(
hr
))
{
WARN
(
"Failed to initialize vertex declaration, hr %#x.
\n
"
,
hr
);
...
...
@@ -121,8 +121,6 @@ static HRESULT vertexshader_create_vertexdeclaration(IDirect3DDevice8Impl *devic
return
hr
;
}
object
->
shader_handle
=
shader_handle
;
TRACE
(
"Created vertex declaration %p.
\n
"
,
object
);
*
decl_ptr
=
(
IDirect3DVertexDeclaration8
*
)
object
;
...
...
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