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
f2f90b69
Commit
f2f90b69
authored
Dec 09, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Dec 11, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Fix ARG_UNUSED and use it properly.
That bug was uncovered by Henri's change of the bitfield sizes.
parent
fef73782
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
11 deletions
+11
-11
utils.c
dlls/wined3d/utils.c
+10
-10
wined3d_private.h
dlls/wined3d/wined3d_private.h
+1
-1
No files found.
dlls/wined3d/utils.c
View file @
f2f90b69
...
...
@@ -1957,14 +1957,14 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
cop
=
stateblock
->
textureState
[
i
][
WINED3DTSS_COLOROP
];
aop
=
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAOP
];
carg1
=
(
args
[
cop
]
&
ARG1
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG1
]
:
0xffffffff
;
carg2
=
(
args
[
cop
]
&
ARG2
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG2
]
:
0xffffffff
;
carg0
=
(
args
[
cop
]
&
ARG0
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG0
]
:
0xffffffff
;
carg1
=
(
args
[
cop
]
&
ARG1
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG1
]
:
ARG_UNUSED
;
carg2
=
(
args
[
cop
]
&
ARG2
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG2
]
:
ARG_UNUSED
;
carg0
=
(
args
[
cop
]
&
ARG0
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_COLORARG0
]
:
ARG_UNUSED
;
if
(
is_invalid_op
(
stateblock
->
wineD3DDevice
,
i
,
cop
,
carg1
,
carg2
,
carg0
))
{
carg0
=
0xffffffff
;
carg2
=
0xffffffff
;
carg0
=
ARG_UNUSED
;
carg2
=
ARG_UNUSED
;
carg1
=
WINED3DTA_CURRENT
;
cop
=
WINED3DTOP_SELECTARG1
;
}
...
...
@@ -1978,9 +1978,9 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
aarg2
=
carg2
;
aarg0
=
carg0
;
}
else
{
aarg1
=
(
args
[
aop
]
&
ARG1
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG1
]
:
0xffffffff
;
aarg2
=
(
args
[
aop
]
&
ARG2
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG2
]
:
0xffffffff
;
aarg0
=
(
args
[
aop
]
&
ARG0
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG0
]
:
0xffffffff
;
aarg1
=
(
args
[
aop
]
&
ARG1
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG1
]
:
ARG_UNUSED
;
aarg2
=
(
args
[
aop
]
&
ARG2
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG2
]
:
ARG_UNUSED
;
aarg0
=
(
args
[
aop
]
&
ARG0
)
?
stateblock
->
textureState
[
i
][
WINED3DTSS_ALPHAARG0
]
:
ARG_UNUSED
;
}
if
(
i
==
0
&&
stateblock
->
textures
[
0
]
&&
...
...
@@ -2015,8 +2015,8 @@ void gen_ffp_frag_op(IWineD3DStateBlockImpl *stateblock, struct ffp_frag_setting
if
(
is_invalid_op
(
stateblock
->
wineD3DDevice
,
i
,
aop
,
aarg1
,
aarg2
,
aarg0
))
{
aarg0
=
0xffffffff
;
aarg2
=
0xffffffff
;
aarg0
=
ARG_UNUSED
;
aarg2
=
ARG_UNUSED
;
aarg1
=
WINED3DTA_CURRENT
;
aop
=
WINED3DTOP_SELECTARG1
;
}
...
...
dlls/wined3d/wined3d_private.h
View file @
f2f90b69
...
...
@@ -922,7 +922,7 @@ enum dst_arg
/*****************************************************************************
* Fixed function pipeline replacements
*/
#define ARG_UNUSED 0x
3
f
#define ARG_UNUSED 0x
f
f
struct
texture_stage_op
{
unsigned
cop
:
8
;
...
...
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