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
cc0c7d72
Commit
cc0c7d72
authored
Nov 05, 2018
by
Henri Verbeet
Committed by
Alexandre Julliard
Nov 05, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
d3d9: Prefer bind flags over usage flags in d3d9_device_ColorFill().
Signed-off-by:
Henri Verbeet
<
hverbeet@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
86a0f486
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
device.c
dlls/d3d9/device.c
+2
-2
No files found.
dlls/d3d9/device.c
View file @
cc0c7d72
...
@@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface,
...
@@ -1750,13 +1750,13 @@ static HRESULT WINAPI d3d9_device_ColorFill(IDirect3DDevice9Ex *iface,
WARN
(
"Colour fills are not allowed on surfaces with resource access %#x.
\n
"
,
desc
.
access
);
WARN
(
"Colour fills are not allowed on surfaces with resource access %#x.
\n
"
,
desc
.
access
);
return
D3DERR_INVALIDCALL
;
return
D3DERR_INVALIDCALL
;
}
}
if
((
desc
.
usage
&
(
WINED3DUSAGE_RENDERTARGET
|
WINED3DUSAGE_TEXTURE
))
==
WINED3DUSAGE_TEXTUR
E
)
if
((
desc
.
bind_flags
&
(
WINED3D_BIND_RENDER_TARGET
|
WINED3D_BIND_SHADER_RESOURCE
))
==
WINED3D_BIND_SHADER_RESOURC
E
)
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.
\n
"
);
WARN
(
"Colorfill is not allowed on non-RT textures, returning D3DERR_INVALIDCALL.
\n
"
);
return
D3DERR_INVALIDCALL
;
return
D3DERR_INVALIDCALL
;
}
}
if
(
desc
.
usage
&
WINED3DUSAGE_DEPTH
STENCIL
)
if
(
desc
.
bind_flags
&
WINED3D_BIND_DEPTH_
STENCIL
)
{
{
wined3d_mutex_unlock
();
wined3d_mutex_unlock
();
WARN
(
"Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.
\n
"
);
WARN
(
"Colorfill is not allowed on depth stencil surfaces, returning D3DERR_INVALIDCALL.
\n
"
);
...
...
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