Stefan Dösinger : d3d9: Use D3DFOG_* constants instead of plain integers.
Module: wine Branch: master Commit: 903c774263e8d70001670d9102bfb98002a80e77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=903c774263e8d70001670d9102... Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 1 20:02:35 2009 +0100 d3d9: Use D3DFOG_* constants instead of plain integers. --- dlls/d3d9/tests/visual.c | 44 ++++++++++++++++++++++---------------------- 1 files changed, 22 insertions(+), 22 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 5574313..1504a53 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1385,83 +1385,83 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) unsigned int color[11]; } test_data[] = { /* only pixel shader: */ - {0, 1, 0, 3, + {0, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 1, 3, + {0, 1, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 2, 3, + {0, 1, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 3, 0, + {0, 1, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {0, 1, 3, 3, + {0, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader */ - {1, 0, 0, 0, + {1, 0, D3DFOG_NONE, D3DFOG_NONE, {0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 0, 3, + {1, 0, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 1, 3, + {1, 0, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 2, 3, + {1, 0, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 0, 3, 3, + {1, 0, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, /* vertex shader and pixel shader */ - {1, 1, 0, 3, + {1, 1, D3DFOG_NONE, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 1, 3, + {1, 1, D3DFOG_EXP, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 2, 3, + {1, 1, D3DFOG_EXP2, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, - {1, 1, 3, 3, + {1, 1, D3DFOG_LINEAR, D3DFOG_LINEAR, {0x00ff0000, 0x00ff0000, 0x00df2000, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x0040bf00, 0x0020df00, 0x0000ff00, 0x0000ff00}}, #if 0 /* FIXME: these fail on GeForce 8500 */ /* foggy vertex shader */ - {2, 0, 0, 0, + {2, 0, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 1, 0, + {2, 0, D3DFOG_EXP, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 2, 0, + {2, 0, D3DFOG_EXP2, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 0, 3, 0, + {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, #endif /* foggy vertex shader and pixel shader */ - {2, 1, 0, 0, + {2, 1, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 1, 0, + {2, 1, D3DFOG_EXP, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 2, 0, + {2, 1, D3DFOG_EXP2, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, - {2, 1, 3, 0, + {2, 1, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}},
participants (1)
-
Alexandre Julliard