[PATCH] d3d9: Use D3DFOG_* constants instead of plain integers=0A=
unknown (none)
stefan at .
Thu Jan 1 20:02:35 CST 2009
=0A=
---=0A=
dlls/d3d9/tests/visual.c | 44 =
++++++++++++++++++++++----------------------=0A=
1 files changed, 22 insertions(+), 22 deletions(-)=0A=
=0A=
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c=0A=
index 616d5e7..ab43f2d 100644=0A=
--- a/dlls/d3d9/tests/visual.c=0A=
+++ b/dlls/d3d9/tests/visual.c=0A=
@@ -1385,83 +1385,83 @@ static void =
fog_with_shader_test(IDirect3DDevice9 *device)=0A=
unsigned int color[11];=0A=
} test_data[] =3D {=0A=
/* only pixel shader: */=0A=
- {0, 1, 0, 3,=0A=
+ {0, 1, D3DFOG_NONE, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {0, 1, 1, 3,=0A=
+ {0, 1, D3DFOG_EXP, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {0, 1, 2, 3,=0A=
+ {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {0, 1, 3, 0,=0A=
+ {0, 1, D3DFOG_LINEAR, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {0, 1, 3, 3,=0A=
+ {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
/* vertex shader */=0A=
- {1, 0, 0, 0,=0A=
+ {1, 0, D3DFOG_NONE, D3DFOG_NONE,=0A=
{0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, =
0x0000ff00,=0A=
0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}},=0A=
- {1, 0, 0, 3,=0A=
+ {1, 0, D3DFOG_NONE, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {1, 0, 1, 3,=0A=
+ {1, 0, D3DFOG_EXP, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
- {1, 0, 2, 3,=0A=
+ {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {1, 0, 3, 3,=0A=
+ {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
/* vertex shader and pixel shader */=0A=
- {1, 1, 0, 3,=0A=
+ {1, 1, D3DFOG_NONE, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {1, 1, 1, 3,=0A=
+ {1, 1, D3DFOG_EXP, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
- {1, 1, 2, 3,=0A=
+ {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
- {1, 1, 3, 3,=0A=
+ {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR,=0A=
{0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
=0A=
#if 0 /* FIXME: these fail on GeForce 8500 */=0A=
/* foggy vertex shader */=0A=
- {2, 0, 0, 0,=0A=
+ {2, 0, D3DFOG_NONE, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 0, 1, 0,=0A=
+ {2, 0, D3DFOG_EXP, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 0, 2, 0,=0A=
+ {2, 0, D3DFOG_EXP2, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 0, 3, 0,=0A=
+ {2, 0, D3DFOG_LINEAR, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
#endif=0A=
=0A=
/* foggy vertex shader and pixel shader */=0A=
- {2, 1, 0, 0,=0A=
+ {2, 1, D3DFOG_NONE, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 1, 1, 0,=0A=
+ {2, 1, D3DFOG_EXP, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 1, 2, 0,=0A=
+ {2, 1, D3DFOG_EXP2, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
- {2, 1, 3, 0,=0A=
+ {2, 1, D3DFOG_LINEAR, D3DFOG_NONE,=0A=
{0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, =
0x007f8000,=0A=
0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},=0A=
=0A=
-- =0A=
1.6.0.6=0A=
=0A=
------=_NextPart_000_0014_01C97515.DB1B4410--
More information about the wine-patches
mailing list