Module: wine Branch: master Commit: 0b67a84b4441d256143b542deac88a506dea32e7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0b67a84b4441d256143b542dea...
Author: Stefan Dösinger stefan@codeweavers.com Date: Wed Jul 2 22:03:41 2008 -0500
wined3d: Wrapping states -> misc.
---
dlls/wined3d/state.c | 48 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 32 insertions(+), 16 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 88546fe..ede92d6 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3950,14 +3950,14 @@ const struct StateEntry FFPStateTable[] = { /*126, Undefined */ 0, state_undefined }, { /*127, Undefined */ 0, state_undefined }, /* Big hole ends */ - { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*128, WINED3DRS_WRAP0 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*129, WINED3DRS_WRAP1 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*130, WINED3DRS_WRAP2 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*131, WINED3DRS_WRAP3 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*132, WINED3DRS_WRAP4 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*133, WINED3DRS_WRAP5 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*134, WINED3DRS_WRAP6 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*135, WINED3DRS_WRAP7 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*136, WINED3DRS_CLIPPING */ STATE_RENDER(WINED3DRS_CLIPPING), state_clipping }, { /*137, WINED3DRS_LIGHTING */ STATE_RENDER(WINED3DRS_LIGHTING), state_lighting }, { /*138, WINED3DRS_EXTENTS */ STATE_RENDER(WINED3DRS_EXTENTS), state_extents }, @@ -4022,14 +4022,14 @@ const struct StateEntry FFPStateTable[] = { /*195, WINED3DRS_DEPTHBIAS */ STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }, { /*196, undefined */ 0, state_undefined }, { /*197, undefined */ 0, state_undefined }, - { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, - { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), state_wrap }, + { /*198, WINED3DRS_WRAP8 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*199, WINED3DRS_WRAP9 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*200, WINED3DRS_WRAP10 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*201, WINED3DRS_WRAP11 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*202, WINED3DRS_WRAP12 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*203, WINED3DRS_WRAP13 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*204, WINED3DRS_WRAP14 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, + { /*205, WINED3DRS_WRAP15 */ STATE_RENDER(WINED3DRS_WRAP0), NULL }, { /*206, WINED3DRS_SEPARATEALPHABLENDENABLE */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /*207, WINED3DRS_SRCBLENDALPHA */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, { /*208, WINED3DRS_DESTBLENDALPHA */ STATE_RENDER(WINED3DRS_ALPHABLENDENABLE), NULL }, @@ -4957,6 +4957,22 @@ const struct StateEntryTemplate misc_state_template[] = { { STATE_RENDER(WINED3DRS_CCW_STENCILZFAIL), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, { STATE_RENDER(WINED3DRS_CCW_STENCILPASS), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, { STATE_RENDER(WINED3DRS_CCW_STENCILFUNC), { STATE_RENDER(WINED3DRS_STENCILENABLE), state_stencil }}, + { STATE_RENDER(WINED3DRS_WRAP0), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP1), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP2), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP3), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP4), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP5), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP6), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP7), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP8), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP9), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP10), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP11), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP12), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP13), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP14), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, + { STATE_RENDER(WINED3DRS_WRAP15), { STATE_RENDER(WINED3DRS_WRAP0), state_wrap }}, {0 /* Terminate */, { 0, 0 }}, };