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
7f973c93
Commit
7f973c93
authored
Dec 19, 2006
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 20, 2006
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Catch nop SetTextureStageState calls.
parent
557b1fa4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
3 deletions
+9
-3
device.c
dlls/wined3d/device.c
+9
-3
No files found.
dlls/wined3d/device.c
View file @
7f973c93
...
...
@@ -4355,7 +4355,7 @@ static void WINAPI IWineD3DDeviceImpl_ApplyTextureUnitState(IWineD3DDevice *ifac
*****/
static
HRESULT
WINAPI
IWineD3DDeviceImpl_SetTextureStageState
(
IWineD3DDevice
*
iface
,
DWORD
Stage
,
WINED3DTEXTURESTAGESTATETYPE
Type
,
DWORD
Value
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
DWORD
old
ColorOp
=
This
->
updateStateBlock
->
textureState
[
Stage
][
WINED3DTSS_COLOROP
];
DWORD
old
Value
=
This
->
updateStateBlock
->
textureState
[
Stage
][
Type
];
/* FIXME: Handle 3d textures? What if TSS value set before set texture? Need to reapply all values? */
...
...
@@ -4376,6 +4376,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if
return
WINED3D_OK
;
}
/* Checked after the assignments to allow proper stateblock recording */
if
(
oldValue
==
Value
)
{
TRACE
(
"App is setting the old value over, nothing to do
\n
"
);
return
WINED3D_OK
;
}
if
(
Stage
>
This
->
stateBlock
->
lowest_disabled_stage
&&
StateTable
[
STATE_TEXTURESTAGE
(
0
,
Type
)].
representative
==
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_COLOROP
))
{
/* Colorop change above lowest disabled stage? That won't change anything in the gl setup
...
...
@@ -4387,7 +4393,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if
if
(
Type
==
WINED3DTSS_COLOROP
)
{
int
i
;
if
(
Value
==
WINED3DTOP_DISABLE
&&
old
ColorOp
!=
WINED3DTOP_DISABLE
)
{
if
(
Value
==
WINED3DTOP_DISABLE
&&
old
Value
!=
WINED3DTOP_DISABLE
)
{
/* Previously enabled stage disabled now. Make sure to dirtify all enabled stages above Stage,
* they have to be disabled
*
...
...
@@ -4399,7 +4405,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetTextureStageState(IWineD3DDevice *if
}
This
->
stateBlock
->
lowest_disabled_stage
=
Stage
;
TRACE
(
"New lowest disabled: %d
\n
"
,
Stage
);
}
else
if
(
Value
!=
WINED3DTOP_DISABLE
&&
old
ColorOp
==
WINED3DTOP_DISABLE
)
{
}
else
if
(
Value
!=
WINED3DTOP_DISABLE
&&
old
Value
==
WINED3DTOP_DISABLE
)
{
/* Previously disabled stage enabled. Stages above it may need enabling
* stage must be lowest_disabled_stage here, if it's bigger success is returned above,
* and stages below the lowest disabled stage can't be enabled(because they are enabled already).
...
...
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