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
4ff6946b
Commit
4ff6946b
authored
Aug 02, 2016
by
Henri Verbeet
Committed by
Alexandre Julliard
Aug 02, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Use wined3d_texture_load_location() in draw_primitive().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
887bf435
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
14 deletions
+13
-14
drawprim.c
dlls/wined3d/drawprim.c
+13
-14
No files found.
dlls/wined3d/drawprim.c
View file @
4ff6946b
...
@@ -438,21 +438,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
...
@@ -438,21 +438,20 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
for
(
i
=
0
;
i
<
gl_info
->
limits
.
buffers
;
++
i
)
{
{
struct
wined3d_rendertarget_view
*
rtv
=
fb
->
render_targets
[
i
];
struct
wined3d_rendertarget_view
*
rtv
=
fb
->
render_targets
[
i
];
struct
wined3d_
surface
*
target
=
wined3d_rendertarget_view_get_surface
(
rtv
)
;
struct
wined3d_
texture
*
rt
;
if
(
target
&&
rtv
->
format
->
id
!=
WINED3DFMT_NULL
)
if
(
!
rtv
||
rtv
->
format
->
id
==
WINED3DFMT_NULL
)
continue
;
rt
=
wined3d_texture_from_resource
(
rtv
->
resource
);
if
(
state
->
render_states
[
WINED3D_RS_COLORWRITEENABLE
])
{
{
if
(
state
->
render_states
[
WINED3D_RS_COLORWRITEENABLE
])
wined3d_texture_load_location
(
rt
,
rtv
->
sub_resource_idx
,
context
,
rtv
->
resource
->
draw_binding
);
{
wined3d_texture_invalidate_location
(
rt
,
rtv
->
sub_resource_idx
,
~
rtv
->
resource
->
draw_binding
);
surface_load_location
(
target
,
context
,
rtv
->
resource
->
draw_binding
);
}
wined3d_texture_invalidate_location
(
target
->
container
,
else
rtv
->
sub_resource_idx
,
~
rtv
->
resource
->
draw_binding
);
{
}
wined3d_texture_prepare_location
(
rt
,
rtv
->
sub_resource_idx
,
context
,
rtv
->
resource
->
draw_binding
);
else
{
wined3d_texture_prepare_location
(
target
->
container
,
rtv
->
sub_resource_idx
,
context
,
rtv
->
resource
->
draw_binding
);
}
}
}
}
}
...
@@ -482,7 +481,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
...
@@ -482,7 +481,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s
IntersectRect
(
&
r
,
&
draw_rect
,
&
current_rect
);
IntersectRect
(
&
r
,
&
draw_rect
,
&
current_rect
);
if
(
!
EqualRect
(
&
r
,
&
draw_rect
))
if
(
!
EqualRect
(
&
r
,
&
draw_rect
))
surface_load_location
(
ds
,
context
,
location
);
wined3d_texture_load_location
(
ds
->
container
,
dsv
->
sub_resource_idx
,
context
,
location
);
else
else
wined3d_texture_prepare_location
(
ds
->
container
,
dsv
->
sub_resource_idx
,
context
,
location
);
wined3d_texture_prepare_location
(
ds
->
container
,
dsv
->
sub_resource_idx
,
context
,
location
);
}
}
...
...
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