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
efbd6d63
Commit
efbd6d63
authored
Feb 15, 2007
by
Stefan Dösinger
Committed by
Alexandre Julliard
Feb 15, 2007
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Give the bump env matrices their own states.
parent
37591409
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
35 additions
and
32 deletions
+35
-32
state.c
dlls/wined3d/state.c
+35
-32
No files found.
dlls/wined3d/state.c
View file @
efbd6d63
...
...
@@ -1950,6 +1950,9 @@ static void pixelshader(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3D
context
->
last_was_pshader
=
use_ps
;
}
static
void
tex_bumpenvmat
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
WineD3DContext
*
context
)
{
}
static
void
transform_world
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
WineD3DContext
*
context
)
{
/* This function is called by transform_view below if the view matrix was changed too
*
...
...
@@ -3210,10 +3213,10 @@ const struct StateEntry StateTable[] =
{
/*0, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*0, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*0, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*0, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*0, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*0, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*0, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*0, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*0, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*0, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*0, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*0, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*0, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*0, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3243,10 +3246,10 @@ const struct StateEntry StateTable[] =
{
/*1, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*1, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*1, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*1, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*1, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*1, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*1, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*1, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*1, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*1, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*1, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*1, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*1, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*1, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3276,10 +3279,10 @@ const struct StateEntry StateTable[] =
{
/*2, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*2, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*2, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*2, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*2, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*2, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*2, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*2, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*2, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*2, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*2, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*2, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*2, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*2, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3309,10 +3312,10 @@ const struct StateEntry StateTable[] =
{
/*3, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*3, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*3, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*3, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*3, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*3, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*3, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*3, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*3, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*3, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*3, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*3, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*3, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*3, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3342,10 +3345,10 @@ const struct StateEntry StateTable[] =
{
/*4, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*4, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*4, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*4, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
COLOROP
),
state_undefined
},
{
/*4, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
COLOROP
),
state_undefined
},
{
/*4, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
COLOROP
),
state_undefined
},
{
/*4, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
COLOROP
),
state_undefined
},
{
/*4, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*4, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*4, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*4, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*4, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*4, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*4, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3375,10 +3378,10 @@ const struct StateEntry StateTable[] =
{
/*5, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*5, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*5, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*5, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*5, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*5, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*5, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*5, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*5, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*5, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*5, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*5, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*5, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*5, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3408,10 +3411,10 @@ const struct StateEntry StateTable[] =
{
/*6, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*6, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*6, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*6, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*6, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*6, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*6, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*6, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*6, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*6, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*6, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*6, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*6, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*6, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
@@ -3441,10 +3444,10 @@ const struct StateEntry StateTable[] =
{
/*7, 04, WINED3DTSS_ALPHAOP */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*7, 05, WINED3DTSS_ALPHAARG1 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*7, 06, WINED3DTSS_ALPHAARG2 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_ALPHAOP
),
tex_alphaop
},
{
/*7, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*7, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*7, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*7, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
COLOROP
),
tex_colorop
},
{
/*7, 07, WINED3DTSS_BUMPENVMAT00 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*7, 08, WINED3DTSS_BUMPENVMAT01 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*7, 09, WINED3DTSS_BUMPENVMAT10 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*7, 10, WINED3DTSS_BUMPENVMAT11 */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_
BUMPENVMAT00
),
tex_bumpenvmat
},
{
/*7, 11, WINED3DTSS_TEXCOORDINDEX */
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_TEXCOORDINDEX
),
tex_coordindex
},
{
/*7, 12, WINED3DTSS_ADDRESS */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
{
/*7, 13, WINED3DTSS_ADDRESSU */
0
/* -> sampler state in ddraw / d3d8 */
,
state_undefined
},
...
...
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
