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
215e3481
Commit
215e3481
authored
Aug 31, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 31, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Use resource mapping functions in d3d_device7_DrawPrimitive().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
7d971714
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
10 additions
and
6 deletions
+10
-6
device.c
dlls/ddraw/device.c
+10
-6
No files found.
dlls/ddraw/device.c
View file @
215e3481
...
...
@@ -3501,9 +3501,11 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
DWORD
vertex_count
,
DWORD
flags
)
{
struct
d3d_device
*
device
=
impl_from_IDirect3DDevice7
(
iface
);
struct
wined3d_map_desc
wined3d_map_desc
;
struct
wined3d_box
wined3d_box
=
{
0
};
UINT
stride
,
vb_pos
,
size
,
align
;
struct
wined3d_resource
*
vb
;
HRESULT
hr
;
BYTE
*
data
;
TRACE
(
"iface %p, primitive_type %#x, fvf %#x, vertices %p, vertex_count %u, flags %#x.
\n
"
,
iface
,
primitive_type
,
fvf
,
vertices
,
vertex_count
,
flags
);
...
...
@@ -3531,12 +3533,14 @@ static HRESULT d3d_device7_DrawPrimitive(IDirect3DDevice7 *iface,
else
vb_pos
+=
align
;
hr
=
wined3d_buffer_map
(
device
->
vertex_buffer
,
vb_pos
,
size
,
&
data
,
vb_pos
?
WINED3D_MAP_NOOVERWRITE
:
WINED3D_MAP_DISCARD
);
if
(
FAILED
(
hr
))
wined3d_box
.
left
=
vb_pos
;
wined3d_box
.
right
=
vb_pos
+
size
;
vb
=
wined3d_buffer_get_resource
(
device
->
vertex_buffer
);
if
(
FAILED
(
hr
=
wined3d_resource_map
(
vb
,
0
,
&
wined3d_map_desc
,
&
wined3d_box
,
vb_pos
?
WINED3D_MAP_NOOVERWRITE
:
WINED3D_MAP_DISCARD
)))
goto
done
;
memcpy
(
data
,
vertices
,
size
);
wined3d_
buffer_unmap
(
device
->
vertex_buffer
);
memcpy
(
wined3d_map_desc
.
data
,
vertices
,
size
);
wined3d_
resource_unmap
(
vb
,
0
);
device
->
vertex_buffer_pos
=
vb_pos
+
size
;
hr
=
wined3d_device_set_stream_source
(
device
->
wined3d_device
,
0
,
device
->
vertex_buffer
,
0
,
stride
);
...
...
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