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
ea40a3a8
Commit
ea40a3a8
authored
Dec 18, 2012
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 18, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Pass the number of vertices to DrawIndexedPrimitive.
parent
671b977d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
ddraw_private.h
dlls/ddraw/ddraw_private.h
+2
-1
executebuffer.c
dlls/ddraw/executebuffer.c
+3
-1
No files found.
dlls/ddraw/ddraw_private.h
View file @
ea40a3a8
...
@@ -494,7 +494,8 @@ struct d3d_execute_buffer
...
@@ -494,7 +494,8 @@ struct d3d_execute_buffer
/* This buffer will store the transformed vertices */
/* This buffer will store the transformed vertices */
void
*
vertex_data
;
void
*
vertex_data
;
WORD
*
indices
;
WORD
*
indices
;
int
nb_indices
;
unsigned
int
nb_indices
;
unsigned
int
nb_vertices
;
/* This flags is set to TRUE if we allocated ourselves the
/* This flags is set to TRUE if we allocated ourselves the
* data buffer
* data buffer
...
...
dlls/ddraw/executebuffer.c
View file @
ea40a3a8
...
@@ -133,7 +133,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
...
@@ -133,7 +133,8 @@ HRESULT d3d_execute_buffer_execute(struct d3d_execute_buffer *buffer,
instr
+=
size
;
instr
+=
size
;
}
}
IDirect3DDevice7_DrawIndexedPrimitive
(
&
device
->
IDirect3DDevice7_iface
,
IDirect3DDevice7_DrawIndexedPrimitive
(
&
device
->
IDirect3DDevice7_iface
,
D3DPT_TRIANGLELIST
,
D3DFVF_TLVERTEX
,
tl_vx
,
0
,
buffer
->
indices
,
count
*
3
,
0
);
D3DPT_TRIANGLELIST
,
D3DFVF_TLVERTEX
,
tl_vx
,
buffer
->
nb_vertices
,
buffer
->
indices
,
count
*
3
,
0
);
}
break
;
}
break
;
case
D3DOP_MATRIXLOAD
:
case
D3DOP_MATRIXLOAD
:
...
@@ -711,6 +712,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer *
...
@@ -711,6 +712,7 @@ static HRESULT WINAPI d3d_execute_buffer_SetExecuteData(IDirect3DExecuteBuffer *
/* Prepares the transformed vertex buffer */
/* Prepares the transformed vertex buffer */
HeapFree
(
GetProcessHeap
(),
0
,
buffer
->
vertex_data
);
HeapFree
(
GetProcessHeap
(),
0
,
buffer
->
vertex_data
);
buffer
->
vertex_data
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
nbvert
*
sizeof
(
D3DTLVERTEX
));
buffer
->
vertex_data
=
HeapAlloc
(
GetProcessHeap
(),
HEAP_ZERO_MEMORY
,
nbvert
*
sizeof
(
D3DTLVERTEX
));
buffer
->
nb_vertices
=
nbvert
;
if
(
TRACE_ON
(
ddraw
))
if
(
TRACE_ON
(
ddraw
))
_dump_executedata
(
data
);
_dump_executedata
(
data
);
...
...
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