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
1150c155
Commit
1150c155
authored
Aug 19, 2011
by
Michael Mc Donnell
Committed by
Alexandre Julliard
Aug 31, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory.
parent
41b6f4ae
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
mesh.c
dlls/d3dx9_36/mesh.c
+3
-3
No files found.
dlls/d3dx9_36/mesh.c
View file @
1150c155
...
...
@@ -3722,7 +3722,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory,
concat_vertex_size
=
D3DXGetDeclVertexSize
(
concat_decl
,
0
);
hr
=
concat_mesh
->
lpVtbl
->
LockVertexBuffer
(
concat_mesh
,
D3DLOCK_DISCARD
,
(
void
**
)
&
concat_vertices
);
hr
=
concat_mesh
->
lpVtbl
->
LockVertexBuffer
(
concat_mesh
,
0
,
(
void
**
)
&
concat_vertices
);
if
(
FAILED
(
hr
))
goto
cleanup
;
LIST_FOR_EACH_ENTRY
(
container_ptr
,
&
container_list
,
struct
mesh_container
,
entry
)
...
...
@@ -3775,7 +3775,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory,
concat_mesh
->
lpVtbl
->
UnlockVertexBuffer
(
concat_mesh
);
concat_vertices
=
NULL
;
hr
=
concat_mesh
->
lpVtbl
->
LockIndexBuffer
(
concat_mesh
,
D3DLOCK_DISCARD
,
&
concat_indices
);
hr
=
concat_mesh
->
lpVtbl
->
LockIndexBuffer
(
concat_mesh
,
0
,
&
concat_indices
);
if
(
FAILED
(
hr
))
goto
cleanup
;
index_offset
=
0
;
...
...
@@ -3814,7 +3814,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory,
DWORD
*
concat_attrib_buffer
=
NULL
;
DWORD
offset
=
0
;
hr
=
concat_mesh
->
lpVtbl
->
LockAttributeBuffer
(
concat_mesh
,
D3DLOCK_DISCARD
,
&
concat_attrib_buffer
);
hr
=
concat_mesh
->
lpVtbl
->
LockAttributeBuffer
(
concat_mesh
,
0
,
&
concat_attrib_buffer
);
if
(
FAILED
(
hr
))
goto
cleanup
;
LIST_FOR_EACH_ENTRY
(
container_ptr
,
&
container_list
,
struct
mesh_container
,
entry
)
...
...
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