[PATCH] WineD3D: check for ATI_ENVMAP_BUMPMAP in the template=0A=
Stefan Doesinger
stefan at codeweavers.com
Sat Jul 5 16:14:00 CDT 2008
=0A=
Note that GL_ATI_envmap_bumpmap is not the same as=0A=
GL_ATI_fragment_shader. envmap_bumpmap is used together with=0A=
the regular opengl ffp pipeline and is not used(other than=0A=
for pixelformats) if GL_ATI_fragment_shader is used=0A=
---=0A=
dlls/wined3d/state.c | 91 =
++++++++++++++++++++++++-------------------------=0A=
1 files changed, 45 insertions(+), 46 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 32916d3..db3beea 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -2523,20 +2523,19 @@ static void shader_bumpenvmat(DWORD state, =
IWineD3DStateBlockImpl *stateblock, W=0A=
static void tex_bumpenvmat(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
DWORD stage =3D (state - STATE_TEXTURESTAGE(0, 0)) / =
WINED3D_HIGHEST_TEXTURE_STATE;=0A=
float mat[2][2];=0A=
- if(GL_SUPPORT(ATI_ENVMAP_BUMPMAP)) {=0A=
- if(stage >=3D GL_LIMITS(texture_stages)) {=0A=
- WARN("Bump env matrix of unsupported stage set\n");=0A=
- } else if(GL_SUPPORT(ARB_MULTITEXTURE)) {=0A=
- GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage));=0A=
- checkGLcall("GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB =
+ stage))");=0A=
- }=0A=
- mat[0][0] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]);=0A=
- mat[1][0] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT01]);=0A=
- mat[0][1] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT10]);=0A=
- mat[1][1] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT11]);=0A=
- GL_EXTCALL(glTexBumpParameterfvATI(GL_BUMP_ROT_MATRIX_ATI, =
(float *) mat));=0A=
- checkGLcall("glTexBumpParameterfvATI");=0A=
- }=0A=
+=0A=
+ if(stage >=3D GL_LIMITS(texture_stages)) {=0A=
+ WARN("Bump env matrix of unsupported stage set\n");=0A=
+ } else if(GL_SUPPORT(ARB_MULTITEXTURE)) {=0A=
+ GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + stage));=0A=
+ checkGLcall("GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB + =
stage))");=0A=
+ }=0A=
+ mat[0][0] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT00]);=0A=
+ mat[1][0] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT01]);=0A=
+ mat[0][1] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT10]);=0A=
+ mat[1][1] =3D *((float *) =
&stateblock->textureState[stage][WINED3DTSS_BUMPENVMAT11]);=0A=
+ GL_EXTCALL(glTexBumpParameterfvATI(GL_BUMP_ROT_MATRIX_ATI, (float =
*) mat));=0A=
+ checkGLcall("glTexBumpParameterfvATI");=0A=
}=0A=
=0A=
static void transform_world(DWORD state, IWineD3DStateBlockImpl =
*stateblock, WineD3DContext *context) {=0A=
@@ -4375,10 +4374,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4389,10 +4388,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(1, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4403,10 +4402,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(2, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4417,10 +4416,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(3, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4431,10 +4430,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(4, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4445,10 +4444,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(5, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4459,10 +4458,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(6, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
@@ -4473,10 +4472,10 @@ static const struct StateEntryTemplate =
ffp_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG1), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG2), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, 0 },=0A=
+ { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
+ { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), tex_bumpenvmat =
}, ATI_ENVMAP_BUMPMAP },=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAARG0), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_ALPHAOP), tex_alphaop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(7, WINED3DTSS_RESULTARG), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), tex_colorop =
}, 0 },=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0046_01C8E844.FBA58CD0--
More information about the wine-patches
mailing list