[PATCH] WineD3D: A few more junk misc states=0A=
Stefan Doesinger
stefan at codeweavers.com
Wed Jul 2 22:16:29 CDT 2008
=0A=
---=0A=
dlls/wined3d/state.c | 39 ++++++++++++++++++++++++++-------------=0A=
1 files changed, 26 insertions(+), 13 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 785d640..7780367 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -3960,13 +3960,13 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /*135, WINED3DRS_WRAP7 */ =
STATE_RENDER(WINED3DRS_WRAP0), NULL =
},=0A=
{ /*136, WINED3DRS_CLIPPING */ =
STATE_RENDER(WINED3DRS_CLIPPING), NULL =
},=0A=
{ /*137, WINED3DRS_LIGHTING */ =
STATE_RENDER(WINED3DRS_LIGHTING), NULL =
},=0A=
- { /*138, WINED3DRS_EXTENTS */ =
STATE_RENDER(WINED3DRS_EXTENTS), state_extents =
},=0A=
+ { /*138, WINED3DRS_EXTENTS */ =
STATE_RENDER(WINED3DRS_EXTENTS), NULL =
},=0A=
{ /*139, WINED3DRS_AMBIENT */ =
STATE_RENDER(WINED3DRS_AMBIENT), NULL =
},=0A=
{ /*140, WINED3DRS_FOGVERTEXMODE */ =
STATE_RENDER(WINED3DRS_FOGENABLE), NULL =
},=0A=
{ /*141, WINED3DRS_COLORVERTEX */ =
STATE_RENDER(WINED3DRS_COLORVERTEX), NULL =
},=0A=
{ /*142, WINED3DRS_LOCALVIEWER */ =
STATE_RENDER(WINED3DRS_LOCALVIEWER), NULL =
},=0A=
{ /*143, WINED3DRS_NORMALIZENORMALS */ =
STATE_RENDER(WINED3DRS_NORMALIZENORMALS), NULL =
},=0A=
- { /*144, WINED3DRS_COLORKEYBLENDENABLE */ =
STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_ckeyblend =
},=0A=
+ { /*144, WINED3DRS_COLORKEYBLENDENABLE */ =
STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), NULL =
},=0A=
{ /*145, WINED3DRS_DIFFUSEMATERIALSOURCE */ =
STATE_RENDER(WINED3DRS_COLORVERTEX), NULL =
},=0A=
{ /*146, WINED3DRS_SPECULARMATERIALSOURCE */ =
STATE_RENDER(WINED3DRS_COLORVERTEX), NULL =
},=0A=
{ /*147, WINED3DRS_AMBIENTMATERIALSOURCE */ =
STATE_RENDER(WINED3DRS_COLORVERTEX), NULL =
},=0A=
@@ -3985,8 +3985,8 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /*160, WINED3DRS_POINTSCALE_C */ =
STATE_RENDER(WINED3DRS_POINTSCALEENABLE), state_pscale =
},=0A=
{ /*161, WINED3DRS_MULTISAMPLEANTIALIAS */ =
STATE_RENDER(WINED3DRS_MULTISAMPLEANTIALIAS), state_multisampleaa =
},=0A=
{ /*162, WINED3DRS_MULTISAMPLEMASK */ =
STATE_RENDER(WINED3DRS_MULTISAMPLEMASK), state_multisampmask =
},=0A=
- { /*163, WINED3DRS_PATCHEDGESTYLE */ =
STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), =
state_patchedgestyle},=0A=
- { /*164, WINED3DRS_PATCHSEGMENTS */ =
STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments =
},=0A=
+ { /*163, WINED3DRS_PATCHEDGESTYLE */ =
STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), NULL =
},=0A=
+ { /*164, WINED3DRS_PATCHSEGMENTS */ =
STATE_RENDER(WINED3DRS_PATCHSEGMENTS), NULL =
},=0A=
{ /*165, WINED3DRS_DEBUGMONITORTOKEN */ =
STATE_RENDER(WINED3DRS_DEBUGMONITORTOKEN), state_nogl =
},=0A=
{ /*166, WINED3DRS_POINTSIZE_MAX */ =
STATE_RENDER(WINED3DRS_POINTSIZE_MAX), state_psizemax =
},=0A=
{ /*167, WINED3DRS_INDEXEDVERTEXBLENDENABLE */ 0, =
state_nogl },=0A=
@@ -3994,21 +3994,21 @@ const struct StateEntry FFPStateTable[] =3D=0A=
{ /*169, Undefined */ 0, =
state_undefined },=0A=
{ /*170, WINED3DRS_TWEENFACTOR */ 0, =
state_nogl },=0A=
{ /*171, WINED3DRS_BLENDOP */ =
STATE_RENDER(WINED3DRS_BLENDOP), state_blendop =
},=0A=
- { /*172, WINED3DRS_POSITIONDEGREE */ =
STATE_RENDER(WINED3DRS_POSITIONDEGREE), =
state_positiondegree},=0A=
- { /*173, WINED3DRS_NORMALDEGREE */ =
STATE_RENDER(WINED3DRS_NORMALDEGREE), state_normaldegree =
},=0A=
+ { /*172, WINED3DRS_POSITIONDEGREE */ =
STATE_RENDER(WINED3DRS_POSITIONDEGREE), NULL =
},=0A=
+ { /*173, WINED3DRS_NORMALDEGREE */ =
STATE_RENDER(WINED3DRS_NORMALDEGREE), NULL =
},=0A=
/*172, WINED3DRS_POSITIONORDER */ /* Value =
assigned to 2 state names */=0A=
/*173, WINED3DRS_NORMALORDER */ /* Value =
assigned to 2 state names */=0A=
{ /*174, WINED3DRS_SCISSORTESTENABLE */ =
STATE_RENDER(WINED3DRS_SCISSORTESTENABLE), state_scissor =
},=0A=
{ /*175, WINED3DRS_SLOPESCALEDEPTHBIAS */ =
STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias =
},=0A=
{ /*176, WINED3DRS_ANTIALIASEDLINEENABLE */ =
STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL =
},=0A=
{ /*177, undefined */ 0, =
state_undefined },=0A=
- { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*179, WINED3DRS_MAXTESSELLATIONLEVEL */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*180, WINED3DRS_ADAPTIVETESS_X */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*181, WINED3DRS_ADAPTIVETESS_Y */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*182, WINED3DRS_ADAPTIVETESS_Z */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*183, WINED3DRS_ADAPTIVETESS_W */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
- { /*184, WINED3DRS_ENABLEADAPTIVETESSELLATION */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
},=0A=
+ { /*178, WINED3DRS_MINTESSELLATIONLEVEL */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*179, WINED3DRS_MAXTESSELLATIONLEVEL */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*180, WINED3DRS_ADAPTIVETESS_X */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*181, WINED3DRS_ADAPTIVETESS_Y */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*182, WINED3DRS_ADAPTIVETESS_Z */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*183, WINED3DRS_ADAPTIVETESS_W */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
+ { /*184, WINED3DRS_ENABLEADAPTIVETESSELLATION */ =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), NULL =
},=0A=
{ /*185, WINED3DRS_TWOSIDEDSTENCILMODE */ =
STATE_RENDER(WINED3DRS_STENCILENABLE), NULL =
},=0A=
{ /*186, WINED3DRS_CCW_STENCILFAIL */ =
STATE_RENDER(WINED3DRS_STENCILENABLE), NULL =
},=0A=
{ /*187, WINED3DRS_CCW_STENCILZFAIL */ =
STATE_RENDER(WINED3DRS_STENCILENABLE), NULL =
},=0A=
@@ -4973,6 +4973,19 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
{ STATE_RENDER(WINED3DRS_WRAP13), { =
STATE_RENDER(WINED3DRS_WRAP0), state_wrap =
}},=0A=
{ STATE_RENDER(WINED3DRS_WRAP14), { =
STATE_RENDER(WINED3DRS_WRAP0), state_wrap =
}},=0A=
{ STATE_RENDER(WINED3DRS_WRAP15), { =
STATE_RENDER(WINED3DRS_WRAP0), state_wrap =
}},=0A=
+ { STATE_RENDER(WINED3DRS_EXTENTS), { =
STATE_RENDER(WINED3DRS_EXTENTS), state_extents =
}},=0A=
+ { STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), { =
STATE_RENDER(WINED3DRS_COLORKEYBLENDENABLE), state_ckeyblend =
}},=0A=
+ { STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), { =
STATE_RENDER(WINED3DRS_PATCHEDGESTYLE), =
state_patchedgestyle}},=0A=
+ { STATE_RENDER(WINED3DRS_PATCHSEGMENTS), { =
STATE_RENDER(WINED3DRS_PATCHSEGMENTS), state_patchsegments =
}},=0A=
+ { STATE_RENDER(WINED3DRS_POSITIONDEGREE), { =
STATE_RENDER(WINED3DRS_POSITIONDEGREE), =
state_positiondegree}},=0A=
+ { STATE_RENDER(WINED3DRS_NORMALDEGREE), { =
STATE_RENDER(WINED3DRS_NORMALDEGREE), state_normaldegree =
}},=0A=
+ { STATE_RENDER(WINED3DRS_MINTESSELLATIONLEVEL), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_MAXTESSELLATIONLEVEL), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ADAPTIVETESS_X), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Y), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ADAPTIVETESS_Z), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ADAPTIVETESS_W), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
+ { STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), { =
STATE_RENDER(WINED3DRS_ENABLEADAPTIVETESSELLATION), state_tessellation =
}},=0A=
{0 /* Terminate */, { 0, =
0 }},=0A=
};=0A=
=0A=
-- =0A=
1.5.4.5=0A=
=0A=
------=_NextPart_000_0001_01C8E1AF.A8C5F090--
More information about the wine-patches
mailing list