Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Zsolt Vadász
wine
Commits
0924f969
Commit
0924f969
authored
18 years ago
by
Henri Verbeet
Committed by
Alexandre Julliard
18 years ago
Browse files
Options
Downloads
Patches
Plain Diff
wined3d: Texture stages that reference NULL textures should just pass
through the result of the previous stage.
parent
70902595
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
dlls/wined3d/utils.c
+25
-0
25 additions, 0 deletions
dlls/wined3d/utils.c
with
25 additions
and
0 deletions
dlls/wined3d/utils.c
+
25
−
0
View file @
0924f969
...
...
@@ -653,6 +653,17 @@ typedef struct {
GLenum
component_usage
[
3
];
}
tex_op_args
;
static
BOOL
is_invalid_op
(
IWineD3DDeviceImpl
*
This
,
int
stage
,
D3DTEXTUREOP
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
)
{
if
(
op
==
D3DTOP_DISABLE
)
return
FALSE
;
if
(
This
->
stateBlock
->
textures
[
stage
])
return
FALSE
;
if
(
arg1
==
D3DTA_TEXTURE
&&
op
!=
D3DTOP_SELECTARG2
)
return
TRUE
;
if
(
arg2
==
D3DTA_TEXTURE
&&
op
!=
D3DTOP_SELECTARG1
)
return
TRUE
;
if
(
arg3
==
D3DTA_TEXTURE
&&
(
op
==
D3DTOP_MULTIPLYADD
||
op
==
D3DTOP_LERP
))
return
TRUE
;
return
FALSE
;
}
void
set_tex_op_nvrc
(
IWineD3DDevice
*
iface
,
BOOL
is_alpha
,
int
stage
,
D3DTEXTUREOP
op
,
DWORD
arg1
,
DWORD
arg2
,
DWORD
arg3
,
INT
texture_idx
)
{
IWineD3DDeviceImpl
*
This
=
(
IWineD3DDeviceImpl
*
)
iface
;
tex_op_args
tex_op_args
=
{{
0
},
{
0
},
{
0
}};
...
...
@@ -662,6 +673,13 @@ void set_tex_op_nvrc(IWineD3DDevice *iface, BOOL is_alpha, int stage, D3DTEXTURE
TRACE
(
"stage %d, is_alpha %d, op %s, arg1 %#lx, arg2 %#lx, arg3 %#lx, texture_idx %d
\n
"
,
stage
,
is_alpha
,
debug_d3dtop
(
op
),
arg1
,
arg2
,
arg3
,
texture_idx
);
/* If a texture stage references an invalid texture unit the stage just
* passes through the result from the previous stage */
if
(
is_invalid_op
(
This
,
stage
,
op
,
arg1
,
arg2
,
arg3
))
{
arg1
=
D3DTA_CURRENT
;
op
=
D3DTOP_SELECTARG1
;
}
get_src_and_opr_nvrc
(
stage
,
arg1
,
is_alpha
,
&
tex_op_args
.
input
[
0
],
&
tex_op_args
.
mapping
[
0
],
&
tex_op_args
.
component_usage
[
0
],
texture_idx
);
get_src_and_opr_nvrc
(
stage
,
arg2
,
is_alpha
,
&
tex_op_args
.
input
[
1
],
...
...
@@ -1053,6 +1071,13 @@ void set_tex_op(IWineD3DDevice *iface, BOOL isAlpha, int Stage, D3DTEXTUREOP op,
scal_target
=
useext
(
GL_RGB_SCALE
);
}
/* If a texture stage references an invalid texture unit the stage just
* passes through the result from the previous stage */
if
(
is_invalid_op
(
This
,
Stage
,
op
,
arg1
,
arg2
,
arg3
))
{
arg1
=
D3DTA_CURRENT
;
op
=
D3DTOP_SELECTARG1
;
}
/* From MSDN (WINED3DTSS_ALPHAARG1) :
The default argument is D3DTA_TEXTURE. If no texture is set for this stage,
then the default argument is D3DTA_DIFFUSE.
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment