Module: wine Branch: master Commit: 20ce6bd102baa407ca5c6960e4416ab429ae7c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ce6bd102baa407ca5c6960e4...
Author: Stefan Dösinger stefan@codeweavers.com Date: Mon Sep 9 15:15:38 2013 +0200
ddraw/tests: Don't test transformed vertices with normals.
They crash the GPU driver of my r200 WinXP laptop, causing anything from a BSOD to a frozen or black screen and sometimes incorrectly set resolutions.
---
dlls/ddraw/tests/ddraw4.c | 25 ------------------------- dlls/ddraw/tests/ddraw7.c | 26 -------------------------- 2 files changed, 0 insertions(+), 51 deletions(-)
diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 485633f..21a2d40 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3516,21 +3516,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, };
-#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - static const struct { DWORD vertextype; @@ -3600,16 +3585,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, };
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c97432..ebfb16f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3339,22 +3339,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, };
-#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - - static const struct { DWORD vertextype; @@ -3422,16 +3406,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, };
window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,
-
Alexandre Julliard