[PATCH] WineD3D: Coalesce the nvrc and nvts+nvrc state template=0A=
Stefan Doesinger
stefan at codeweavers.com
Sat Jul 5 15:20:10 CDT 2008
=0A=
---=0A=
dlls/wined3d/nvidia_texture_shader.c | 142 =
++++------------------------------=0A=
1 files changed, 15 insertions(+), 127 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/nvidia_texture_shader.c =
b/dlls/wined3d/nvidia_texture_shader.c=0A=
index 6b8c71c..60454ae 100644=0A=
--- a/dlls/wined3d/nvidia_texture_shader.c=0A=
+++ b/dlls/wined3d/nvidia_texture_shader.c=0A=
@@ -290,133 +290,6 @@ static void nvrc_fragment_free(IWineD3DDevice =
*iface) {}=0A=
* register combiners extension(Pre-GF3).=0A=
*/=0A=
=0A=
-const struct StateEntryTemplate nvts_fragmentstate_template[] =3D {=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(1, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(1, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(2, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(2, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(3, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(3, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(4, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(4, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(5, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(5, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(6, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(6, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_COLORARG2), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=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), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT01), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT10), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT11), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_BUMPENVMAT00), nvts_bumpenvmat =
}, 0 },=0A=
- { STATE_TEXTURESTAGE(7, WINED3DTSS_COLORARG0), { =
STATE_TEXTURESTAGE(7, WINED3DTSS_COLOROP), nvrc_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), nvrc_colorop =
}, 0 },=0A=
- { STATE_PIXELSHADER, { =
STATE_PIXELSHADER, apply_pixelshader =
}, 0 },=0A=
- { STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { =
STATE_PIXELSHADER, apply_pixelshader =
}, 0 },=0A=
- { STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { =
STATE_RENDER(WINED3DRS_TEXTUREFACTOR), nvrc_texfactor =
}, 0 },=0A=
- { STATE_SAMPLER(0), { =
STATE_SAMPLER(0), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(1), { =
STATE_SAMPLER(1), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(2), { =
STATE_SAMPLER(2), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(3), { =
STATE_SAMPLER(3), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(4), { =
STATE_SAMPLER(4), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(5), { =
STATE_SAMPLER(5), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(6), { =
STATE_SAMPLER(6), nvts_texdim =
}, 0 },=0A=
- { STATE_SAMPLER(7), { =
STATE_SAMPLER(7), nvts_texdim =
}, 0 },=0A=
- {0 /* Terminate */, { 0, =
0 }, 0 =
},=0A=
-};=0A=
-=0A=
-const struct fragment_pipeline nvts_fragment_pipeline =3D {=0A=
- nvts_enable,=0A=
- nvrc_fragment_get_caps,=0A=
- nvrc_fragment_alloc,=0A=
- nvrc_fragment_free,=0A=
- nvts_fragmentstate_template=0A=
-};=0A=
-=0A=
const struct StateEntryTemplate nvrc_fragmentstate_template[] =3D {=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
{ STATE_TEXTURESTAGE(0, WINED3DTSS_COLORARG1), { =
STATE_TEXTURESTAGE(0, WINED3DTSS_COLOROP), nvrc_colorop =
}, 0 },=0A=
@@ -525,17 +398,32 @@ const struct StateEntryTemplate =
nvrc_fragmentstate_template[] =3D {=0A=
{ STATE_PIXELSHADER, { =
STATE_PIXELSHADER, apply_pixelshader =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_SRGBWRITEENABLE), { =
STATE_PIXELSHADER, apply_pixelshader =
}, 0 },=0A=
{ STATE_RENDER(WINED3DRS_TEXTUREFACTOR), { =
STATE_RENDER(WINED3DRS_TEXTUREFACTOR), nvrc_texfactor =
}, 0 },=0A=
+ { STATE_SAMPLER(0), { =
STATE_SAMPLER(0), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(0), { =
STATE_SAMPLER(0), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(1), { =
STATE_SAMPLER(1), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(1), { =
STATE_SAMPLER(1), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(2), { =
STATE_SAMPLER(2), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(2), { =
STATE_SAMPLER(2), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(3), { =
STATE_SAMPLER(3), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(3), { =
STATE_SAMPLER(3), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(4), { =
STATE_SAMPLER(4), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(4), { =
STATE_SAMPLER(4), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(5), { =
STATE_SAMPLER(5), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(5), { =
STATE_SAMPLER(5), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(6), { =
STATE_SAMPLER(6), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(6), { =
STATE_SAMPLER(6), sampler_texdim =
}, 0 },=0A=
+ { STATE_SAMPLER(7), { =
STATE_SAMPLER(7), nvts_texdim =
}, NV_TEXTURE_SHADER2 },=0A=
{ STATE_SAMPLER(7), { =
STATE_SAMPLER(7), sampler_texdim =
}, 0 },=0A=
{0 /* Terminate */, { 0, =
0 }, 0 =
},=0A=
};=0A=
=0A=
+const struct fragment_pipeline nvts_fragment_pipeline =3D {=0A=
+ nvts_enable,=0A=
+ nvrc_fragment_get_caps,=0A=
+ nvrc_fragment_alloc,=0A=
+ nvrc_fragment_free,=0A=
+ nvrc_fragmentstate_template=0A=
+};=0A=
=0A=
const struct fragment_pipeline nvrc_fragment_pipeline =3D {=0A=
nvrc_enable,=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0027_01C8E78C.1A0C23A0--
More information about the wine-patches
mailing list