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
cece23c7
Commit
cece23c7
authored
Apr 07, 2010
by
Henri Verbeet
Committed by
Alexandre Julliard
Apr 08, 2010
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wined3d: Get rid of state_nogl().
It's unused, all states that have this as handler have a 0 representative.
parent
3f79ba30
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
22 deletions
+8
-22
state.c
dlls/wined3d/state.c
+8
-22
No files found.
dlls/wined3d/state.c
View file @
cece23c7
...
...
@@ -41,20 +41,6 @@ WINE_DECLARE_DEBUG_CHANNEL(d3d_shader);
static
void
state_blendop
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
);
static
void
state_nogl
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
{
/* Used for states which are not mapped to a gl state as-is, but used somehow different,
* e.g as a parameter for drawing, or which are unimplemented in windows d3d
*/
if
(
STATE_IS_RENDER
(
state
))
{
WINED3DRENDERSTATETYPE
RenderState
=
state
-
STATE_RENDER
(
0
);
TRACE
(
"(%s,%d) no direct mapping to gl
\n
"
,
debug_d3drenderstate
(
RenderState
),
stateblock
->
renderState
[
RenderState
]);
}
else
{
/* Shouldn't have an unknown type here */
FIXME
(
"%d no direct mapping to gl of state with unknown type
\n
"
,
state
);
}
}
static
void
state_undefined
(
DWORD
state
,
IWineD3DStateBlockImpl
*
stateblock
,
struct
wined3d_context
*
context
)
{
ERR
(
"Undefined state.
\n
"
);
...
...
@@ -5454,7 +5440,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
0
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5464,7 +5450,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
1
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5474,7 +5460,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
2
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5484,7 +5470,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
3
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5494,7 +5480,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
4
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5504,7 +5490,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
5
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5514,7 +5500,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
6
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
tex_colorop
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLORARG1
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLORARG2
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
...
...
@@ -5524,7 +5510,7 @@ static const struct StateEntryTemplate ffp_fragmentstate_template[] = {
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLORARG0
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_ALPHAARG0
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_ALPHAOP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_RESULTARG
),
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_COLOROP
),
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
state_nogl
},
WINED3D_GL_EXT_NONE
},
{
STATE_TEXTURESTAGE
(
7
,
WINED3DTSS_CONSTANT
),
{
0
/* As long as we don't support D3DTA_CONSTANT */
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_PIXELSHADER
,
{
STATE_PIXELSHADER
,
apply_pixelshader
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_SRGBWRITEENABLE
),
{
STATE_PIXELSHADER
,
NULL
},
WINED3D_GL_EXT_NONE
},
{
STATE_RENDER
(
WINED3DRS_TEXTUREFACTOR
),
{
STATE_RENDER
(
WINED3DRS_TEXTUREFACTOR
),
state_texfactor
},
WINED3D_GL_EXT_NONE
},
...
...
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
