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
228f2cf3
Commit
228f2cf3
authored
Aug 01, 2008
by
Stefan Dösinger
Committed by
Alexandre Julliard
Aug 04, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Initialize the texture op function properly.
parent
59e21554
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
1 deletion
+5
-1
utils.c
dlls/wined3d/utils.c
+3
-0
wined3d_private.h
dlls/wined3d/wined3d_private.h
+2
-1
No files found.
dlls/wined3d/utils.c
View file @
228f2cf3
...
@@ -1792,6 +1792,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
...
@@ -1792,6 +1792,7 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
for
(
i
=
0
;
i
<
GL_LIMITS
(
texture_stages
);
i
++
)
{
for
(
i
=
0
;
i
<
GL_LIMITS
(
texture_stages
);
i
++
)
{
IWineD3DBaseTextureImpl
*
texture
;
IWineD3DBaseTextureImpl
*
texture
;
settings
->
op
[
i
].
padding
=
0
;
if
(
stateblock
->
textureState
[
i
][
WINED3DTSS_COLOROP
]
==
WINED3DTOP_DISABLE
)
{
if
(
stateblock
->
textureState
[
i
][
WINED3DTSS_COLOROP
]
==
WINED3DTOP_DISABLE
)
{
settings
->
op
[
i
].
cop
=
WINED3DTOP_DISABLE
;
settings
->
op
[
i
].
cop
=
WINED3DTOP_DISABLE
;
settings
->
op
[
i
].
aop
=
WINED3DTOP_DISABLE
;
settings
->
op
[
i
].
aop
=
WINED3DTOP_DISABLE
;
...
@@ -1800,6 +1801,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
...
@@ -1800,6 +1801,8 @@ void gen_ffp_op(IWineD3DStateBlockImpl *stateblock, struct ffp_settings *setting
settings
->
op
[
i
].
aarg0
=
settings
->
op
[
i
].
aarg1
=
settings
->
op
[
i
].
aarg2
=
0x3F
;
settings
->
op
[
i
].
aarg0
=
settings
->
op
[
i
].
aarg1
=
settings
->
op
[
i
].
aarg2
=
0x3F
;
settings
->
op
[
i
].
color_correction
=
WINED3DFMT_UNKNOWN
;
settings
->
op
[
i
].
color_correction
=
WINED3DFMT_UNKNOWN
;
settings
->
op
[
i
].
dst
=
resultreg
;
settings
->
op
[
i
].
dst
=
resultreg
;
settings
->
op
[
i
].
tex_type
=
tex_1d
;
settings
->
op
[
i
].
projected
=
proj_none
;
i
++
;
i
++
;
break
;
break
;
}
}
...
...
dlls/wined3d/wined3d_private.h
View file @
228f2cf3
...
@@ -745,9 +745,10 @@ struct texture_stage_op
...
@@ -745,9 +745,10 @@ struct texture_stage_op
unsigned
cop
:
5
,
aop
:
5
;
unsigned
cop
:
5
,
aop
:
5
;
unsigned
carg1
:
6
,
carg2
:
6
,
carg0
:
6
;
unsigned
carg1
:
6
,
carg2
:
6
,
carg0
:
6
;
unsigned
tex_type
:
3
;
unsigned
tex_type
:
3
;
unsigned
dst
:
1
;
unsigned
dst
:
1
;
/* Total of 32 bits */
unsigned
aarg1
:
6
,
aarg2
:
6
,
aarg0
:
6
;
unsigned
aarg1
:
6
,
aarg2
:
6
,
aarg0
:
6
;
unsigned
projected
:
2
;
unsigned
projected
:
2
;
unsigned
padding
:
12
;
/* Total of 64 bits */
WINED3DFORMAT
color_correction
;
WINED3DFORMAT
color_correction
;
};
};
...
...
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