[PATCH] WineD3D: Samplers -> misc states=0A=

Stefan Doesinger stefan at codeweavers.com
Thu Jul 3 07:04:59 CDT 2008


=0A=
---=0A=
 dlls/wined3d/state.c |   61 =
+++++++++++++++++++++++++++++++++----------------=0A=
 1 files changed, 41 insertions(+), 20 deletions(-)=0A=
=0A=
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c=0A=
index 0a74e79..c7f8d85 100644=0A=
--- a/dlls/wined3d/state.c=0A=
+++ b/dlls/wined3d/state.c=0A=
@@ -4299,26 +4299,26 @@ const struct StateEntry FFPStateTable[] =3D=0A=
     { /*7, 31, undefined                            */      0 /* -> =
sampler state in ddraw / d3d8 */,           state_undefined     },=0A=
     { /*7, 32, WINED3DTSS_CONSTANT                  */      0 /* As =
long as we don't support D3DTA_CONSTANT */, NULL                },=0A=
     /* Sampler states */=0A=
-    { /* 0, Sampler 0                               */      =
STATE_SAMPLER(0),                                   sampler             =
},=0A=
-    { /* 1, Sampler 1                               */      =
STATE_SAMPLER(1),                                   sampler             =
},=0A=
-    { /* 2, Sampler 2                               */      =
STATE_SAMPLER(2),                                   sampler             =
},=0A=
-    { /* 3, Sampler 3                               */      =
STATE_SAMPLER(3),                                   sampler             =
},=0A=
-    { /* 4, Sampler 3                               */      =
STATE_SAMPLER(4),                                   sampler             =
},=0A=
-    { /* 5, Sampler 5                               */      =
STATE_SAMPLER(5),                                   sampler             =
},=0A=
-    { /* 6, Sampler 6                               */      =
STATE_SAMPLER(6),                                   sampler             =
},=0A=
-    { /* 7, Sampler 7                               */      =
STATE_SAMPLER(7),                                   sampler             =
},=0A=
-    { /* 8, Sampler 8                               */      =
STATE_SAMPLER(8),                                   sampler             =
},=0A=
-    { /* 9, Sampler 9                               */      =
STATE_SAMPLER(9),                                   sampler             =
},=0A=
-    { /*10, Sampler 10                              */      =
STATE_SAMPLER(10),                                  sampler             =
},=0A=
-    { /*11, Sampler 11                              */      =
STATE_SAMPLER(11),                                  sampler             =
},=0A=
-    { /*12, Sampler 12                              */      =
STATE_SAMPLER(12),                                  sampler             =
},=0A=
-    { /*13, Sampler 13                              */      =
STATE_SAMPLER(13),                                  sampler             =
},=0A=
-    { /*14, Sampler 14                              */      =
STATE_SAMPLER(14),                                  sampler             =
},=0A=
-    { /*15, Sampler 15                              */      =
STATE_SAMPLER(15),                                  sampler             =
},=0A=
-    { /*16, Vertex sampler 0                        */      =
STATE_SAMPLER(16),                                  sampler             =
},=0A=
-    { /*17, Vertex sampler 1                        */      =
STATE_SAMPLER(17),                                  sampler             =
},=0A=
-    { /*18, Vertex sampler 2                        */      =
STATE_SAMPLER(18),                                  sampler             =
},=0A=
-    { /*19, Vertex sampler 3                        */      =
STATE_SAMPLER(19),                                  sampler             =
},=0A=
+    { /* 0, Sampler 0                               */      =
STATE_SAMPLER(0),                                   NULL                =
},=0A=
+    { /* 1, Sampler 1                               */      =
STATE_SAMPLER(1),                                   NULL                =
},=0A=
+    { /* 2, Sampler 2                               */      =
STATE_SAMPLER(2),                                   NULL                =
},=0A=
+    { /* 3, Sampler 3                               */      =
STATE_SAMPLER(3),                                   NULL                =
},=0A=
+    { /* 4, Sampler 3                               */      =
STATE_SAMPLER(4),                                   NULL                =
},=0A=
+    { /* 5, Sampler 5                               */      =
STATE_SAMPLER(5),                                   NULL                =
},=0A=
+    { /* 6, Sampler 6                               */      =
STATE_SAMPLER(6),                                   NULL                =
},=0A=
+    { /* 7, Sampler 7                               */      =
STATE_SAMPLER(7),                                   NULL                =
},=0A=
+    { /* 8, Sampler 8                               */      =
STATE_SAMPLER(8),                                   NULL                =
},=0A=
+    { /* 9, Sampler 9                               */      =
STATE_SAMPLER(9),                                   NULL                =
},=0A=
+    { /*10, Sampler 10                              */      =
STATE_SAMPLER(10),                                  NULL                =
},=0A=
+    { /*11, Sampler 11                              */      =
STATE_SAMPLER(11),                                  NULL                =
},=0A=
+    { /*12, Sampler 12                              */      =
STATE_SAMPLER(12),                                  NULL                =
},=0A=
+    { /*13, Sampler 13                              */      =
STATE_SAMPLER(13),                                  NULL                =
},=0A=
+    { /*14, Sampler 14                              */      =
STATE_SAMPLER(14),                                  NULL                =
},=0A=
+    { /*15, Sampler 15                              */      =
STATE_SAMPLER(15),                                  NULL                =
},=0A=
+    { /*16, Vertex sampler 0                        */      =
STATE_SAMPLER(16),                                  NULL                =
},=0A=
+    { /*17, Vertex sampler 1                        */      =
STATE_SAMPLER(17),                                  NULL                =
},=0A=
+    { /*18, Vertex sampler 2                        */      =
STATE_SAMPLER(18),                                  NULL                =
},=0A=
+    { /*19, Vertex sampler 3                        */      =
STATE_SAMPLER(19),                                  NULL                =
},=0A=
     /* Pixel shader */=0A=
     { /*  , Pixel Shader                            */      =
STATE_PIXELSHADER,                                  NULL                =
},=0A=
       /* Transform states follow                    */=0A=
@@ -4997,6 +4997,27 @@ const struct StateEntryTemplate =
misc_state_template[] =3D {=0A=
     { STATE_RENDER(WINED3DRS_COLORWRITEENABLE3),          { =
STATE_RENDER(WINED3DRS_COLORWRITEENABLE),           state_colorwrite    =
}},=0A=
     { STATE_RENDER(WINED3DRS_BLENDFACTOR),                { =
STATE_RENDER(WINED3DRS_BLENDFACTOR),                state_blendfactor   =
}},=0A=
     { STATE_RENDER(WINED3DRS_DEPTHBIAS),                  { =
STATE_RENDER(WINED3DRS_DEPTHBIAS),                  state_depthbias     =
}},=0A=
+    /* Samplers */=0A=
+    { STATE_SAMPLER(0),                                   { =
STATE_SAMPLER(0),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(1),                                   { =
STATE_SAMPLER(1),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(2),                                   { =
STATE_SAMPLER(2),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(3),                                   { =
STATE_SAMPLER(3),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(4),                                   { =
STATE_SAMPLER(4),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(5),                                   { =
STATE_SAMPLER(5),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(6),                                   { =
STATE_SAMPLER(6),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(7),                                   { =
STATE_SAMPLER(7),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(8),                                   { =
STATE_SAMPLER(8),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(9),                                   { =
STATE_SAMPLER(9),                                   sampler             =
}},=0A=
+    { STATE_SAMPLER(10),                                  { =
STATE_SAMPLER(10),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(11),                                  { =
STATE_SAMPLER(11),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(12),                                  { =
STATE_SAMPLER(12),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(13),                                  { =
STATE_SAMPLER(13),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(14),                                  { =
STATE_SAMPLER(14),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(15),                                  { =
STATE_SAMPLER(15),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(16), /* Vertex sampler 0 */           { =
STATE_SAMPLER(16),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(17), /* Vertex sampler 1 */           { =
STATE_SAMPLER(17),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(18), /* Vertex sampler 2 */           { =
STATE_SAMPLER(18),                                  sampler             =
}},=0A=
+    { STATE_SAMPLER(19), /* Vertex sampler 3 */           { =
STATE_SAMPLER(19),                                  sampler             =
}},=0A=
     {0 /* Terminate */,                                   { 0,          =
                                        0                   }},=0A=
 };=0A=
 =0A=
-- =0A=
1.5.4.5=0A=
=0A=

------=_NextPart_000_001F_01C8E2A2.9FE78A30--




More information about the wine-patches mailing list