Module: wine
Branch: master
Commit: f330815da50c0b29de60caf6b81f8a66b26cd5a2
URL: http://source.winehq.org/git/wine.git/?a=commit;h=f330815da50c0b29de60caf6b81f8a66b26cd5a2
Author: Stefan Dösinger <stefan at codeweavers.com>
Date: Thu Jul 3 07:04:59 2008 -0500
wined3d: Samplers -> misc states.
---
dlls/wined3d/state.c | 61 +++++++++++++++++++++++++++++++++----------------
1 files changed, 41 insertions(+), 20 deletions(-)
diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c
index 0a74e79..c7f8d85 100644
--- a/dlls/wined3d/state.c
+++ b/dlls/wined3d/state.c
@@ -4299,26 +4299,26 @@ const struct StateEntry FFPStateTable[] =
{ /*7, 31, undefined */ 0 /* -> sampler state in ddraw / d3d8 */, state_undefined },
{ /*7, 32, WINED3DTSS_CONSTANT */ 0 /* As long as we don't support D3DTA_CONSTANT */, NULL },
/* Sampler states */
- { /* 0, Sampler 0 */ STATE_SAMPLER(0), sampler },
- { /* 1, Sampler 1 */ STATE_SAMPLER(1), sampler },
- { /* 2, Sampler 2 */ STATE_SAMPLER(2), sampler },
- { /* 3, Sampler 3 */ STATE_SAMPLER(3), sampler },
- { /* 4, Sampler 3 */ STATE_SAMPLER(4), sampler },
- { /* 5, Sampler 5 */ STATE_SAMPLER(5), sampler },
- { /* 6, Sampler 6 */ STATE_SAMPLER(6), sampler },
- { /* 7, Sampler 7 */ STATE_SAMPLER(7), sampler },
- { /* 8, Sampler 8 */ STATE_SAMPLER(8), sampler },
- { /* 9, Sampler 9 */ STATE_SAMPLER(9), sampler },
- { /*10, Sampler 10 */ STATE_SAMPLER(10), sampler },
- { /*11, Sampler 11 */ STATE_SAMPLER(11), sampler },
- { /*12, Sampler 12 */ STATE_SAMPLER(12), sampler },
- { /*13, Sampler 13 */ STATE_SAMPLER(13), sampler },
- { /*14, Sampler 14 */ STATE_SAMPLER(14), sampler },
- { /*15, Sampler 15 */ STATE_SAMPLER(15), sampler },
- { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), sampler },
- { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), sampler },
- { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), sampler },
- { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), sampler },
+ { /* 0, Sampler 0 */ STATE_SAMPLER(0), NULL },
+ { /* 1, Sampler 1 */ STATE_SAMPLER(1), NULL },
+ { /* 2, Sampler 2 */ STATE_SAMPLER(2), NULL },
+ { /* 3, Sampler 3 */ STATE_SAMPLER(3), NULL },
+ { /* 4, Sampler 3 */ STATE_SAMPLER(4), NULL },
+ { /* 5, Sampler 5 */ STATE_SAMPLER(5), NULL },
+ { /* 6, Sampler 6 */ STATE_SAMPLER(6), NULL },
+ { /* 7, Sampler 7 */ STATE_SAMPLER(7), NULL },
+ { /* 8, Sampler 8 */ STATE_SAMPLER(8), NULL },
+ { /* 9, Sampler 9 */ STATE_SAMPLER(9), NULL },
+ { /*10, Sampler 10 */ STATE_SAMPLER(10), NULL },
+ { /*11, Sampler 11 */ STATE_SAMPLER(11), NULL },
+ { /*12, Sampler 12 */ STATE_SAMPLER(12), NULL },
+ { /*13, Sampler 13 */ STATE_SAMPLER(13), NULL },
+ { /*14, Sampler 14 */ STATE_SAMPLER(14), NULL },
+ { /*15, Sampler 15 */ STATE_SAMPLER(15), NULL },
+ { /*16, Vertex sampler 0 */ STATE_SAMPLER(16), NULL },
+ { /*17, Vertex sampler 1 */ STATE_SAMPLER(17), NULL },
+ { /*18, Vertex sampler 2 */ STATE_SAMPLER(18), NULL },
+ { /*19, Vertex sampler 3 */ STATE_SAMPLER(19), NULL },
/* Pixel shader */
{ /* , Pixel Shader */ STATE_PIXELSHADER, NULL },
/* Transform states follow */
@@ -4997,6 +4997,27 @@ const struct StateEntryTemplate misc_state_template[] = {
{ STATE_RENDER(WINED3DRS_COLORWRITEENABLE3), { STATE_RENDER(WINED3DRS_COLORWRITEENABLE), state_colorwrite }},
{ STATE_RENDER(WINED3DRS_BLENDFACTOR), { STATE_RENDER(WINED3DRS_BLENDFACTOR), state_blendfactor }},
{ STATE_RENDER(WINED3DRS_DEPTHBIAS), { STATE_RENDER(WINED3DRS_DEPTHBIAS), state_depthbias }},
+ /* Samplers */
+ { STATE_SAMPLER(0), { STATE_SAMPLER(0), sampler }},
+ { STATE_SAMPLER(1), { STATE_SAMPLER(1), sampler }},
+ { STATE_SAMPLER(2), { STATE_SAMPLER(2), sampler }},
+ { STATE_SAMPLER(3), { STATE_SAMPLER(3), sampler }},
+ { STATE_SAMPLER(4), { STATE_SAMPLER(4), sampler }},
+ { STATE_SAMPLER(5), { STATE_SAMPLER(5), sampler }},
+ { STATE_SAMPLER(6), { STATE_SAMPLER(6), sampler }},
+ { STATE_SAMPLER(7), { STATE_SAMPLER(7), sampler }},
+ { STATE_SAMPLER(8), { STATE_SAMPLER(8), sampler }},
+ { STATE_SAMPLER(9), { STATE_SAMPLER(9), sampler }},
+ { STATE_SAMPLER(10), { STATE_SAMPLER(10), sampler }},
+ { STATE_SAMPLER(11), { STATE_SAMPLER(11), sampler }},
+ { STATE_SAMPLER(12), { STATE_SAMPLER(12), sampler }},
+ { STATE_SAMPLER(13), { STATE_SAMPLER(13), sampler }},
+ { STATE_SAMPLER(14), { STATE_SAMPLER(14), sampler }},
+ { STATE_SAMPLER(15), { STATE_SAMPLER(15), sampler }},
+ { STATE_SAMPLER(16), /* Vertex sampler 0 */ { STATE_SAMPLER(16), sampler }},
+ { STATE_SAMPLER(17), /* Vertex sampler 1 */ { STATE_SAMPLER(17), sampler }},
+ { STATE_SAMPLER(18), /* Vertex sampler 2 */ { STATE_SAMPLER(18), sampler }},
+ { STATE_SAMPLER(19), /* Vertex sampler 3 */ { STATE_SAMPLER(19), sampler }},
{0 /* Terminate */, { 0, 0 }},
};