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
fffde3ca
Commit
fffde3ca
authored
Dec 05, 2022
by
Paul Gofman
Committed by
Alexandre Julliard
Dec 06, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ddraw: Sync draw textures even for hardware device.
Fixes a regression introduced by commit
d2d9f713
.
parent
c7a167ea
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
26 additions
and
5 deletions
+26
-5
ddraw_private.h
dlls/ddraw/ddraw_private.h
+1
-0
device.c
dlls/ddraw/device.c
+25
-5
No files found.
dlls/ddraw/ddraw_private.h
View file @
fffde3ca
...
...
@@ -328,6 +328,7 @@ struct d3d_device
LONG
ref
;
UINT
version
;
BOOL
hardware_device
;
BOOL
have_draw_textures
;
IUnknown
*
outer_unknown
;
struct
wined3d_device
*
wined3d_device
;
...
...
dlls/ddraw/device.c
View file @
fffde3ca
...
...
@@ -3409,11 +3409,11 @@ void d3d_device_sync_surfaces(struct d3d_device *device)
struct
ddraw_surface
*
surface
;
unsigned
int
i
,
j
;
if
(
device
->
hardware_device
)
return
;
d3d_device_sync_rendertarget
(
device
);
if
(
!
device
->
have_draw_textures
)
return
;
for
(
i
=
0
;
i
<
ARRAY_SIZE
(
state
->
textures
);
++
i
)
{
if
(
!
state
->
textures
[
i
])
...
...
@@ -4642,7 +4642,17 @@ static HRESULT d3d_device7_SetTexture(IDirect3DDevice7 *iface,
TRACE
(
"iface %p, stage %lu, texture %p.
\n
"
,
iface
,
stage
,
texture
);
if
(
surf
&&
(
surf
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_TEXTURE
))
wined3d_texture
=
surf
->
draw_texture
?
surf
->
draw_texture
:
surf
->
wined3d_texture
;
{
if
(
surf
->
draw_texture
)
{
wined3d_texture
=
surf
->
draw_texture
;
device
->
have_draw_textures
=
TRUE
;
}
else
{
wined3d_texture
=
surf
->
wined3d_texture
;
}
}
wined3d_mutex_lock
();
wined3d_stateblock_set_texture
(
device
->
update_state
,
stage
,
wined3d_texture
);
...
...
@@ -4682,7 +4692,17 @@ static HRESULT WINAPI d3d_device3_SetTexture(IDirect3DDevice3 *iface,
wined3d_mutex_lock
();
if
(
tex
&&
((
tex
->
surface_desc
.
ddsCaps
.
dwCaps
&
DDSCAPS_TEXTURE
)
||
!
device
->
hardware_device
))
wined3d_texture
=
tex
->
draw_texture
?
tex
->
draw_texture
:
tex
->
wined3d_texture
;
{
if
(
tex
->
draw_texture
)
{
wined3d_texture
=
tex
->
draw_texture
;
device
->
have_draw_textures
=
TRUE
;
}
else
{
wined3d_texture
=
tex
->
wined3d_texture
;
}
}
wined3d_stateblock_set_texture
(
device
->
state
,
stage
,
wined3d_texture
);
fixup_texture_alpha_op
(
device
);
...
...
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