Stefan Dösinger : d3d: Make the INTZ test more reliable.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: d8224118abba228b96d133a9c9c25878346272ba
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=d8224118abba228b96d133a9c9...

Author: Stefan Dösinger 
Date:   Mon May 23 22:45:50 2011 +0200

d3d: Make the INTZ test more reliable.

---

dlls/d3d8/tests/visual.c |   24 ++++++++++++------------
 dlls/d3d9/tests/visual.c |   26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c
index d2ab518..1e48c03 100644
--- a/dlls/d3d8/tests/visual.c
+++ b/dlls/d3d8/tests/visual.c
@@ -1706,10 +1706,10 @@ static void intz_test(IDirect3DDevice8 *device)
     }
     quad[] =
     {
-        { -1.0f,  1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.0f},
-        {  1.0f,  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f},
-        { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-        {  1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 1.0f},
+        { -1.0f,  1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f, 1.0f, 1.0f, 0.5f},
+        {  1.0f,  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f},
+        { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f},
+        {  1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f, 0.5f},
     };
     struct
     {
@@ -1718,14 +1718,14 @@ static void intz_test(IDirect3DDevice8 *device)
     }
     expected_colors[] =
     {
-        {400,  60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)},
-        {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)},
-        {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)},
-        {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)},
-        {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)},
-        { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)},
-        { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)},
-        {240,  60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)},
+        { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)},
+        {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)},
+        {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)},
+        {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)},
+        { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)},
+        {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)},
+        {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)},
+        {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)},
     };

IDirect3DSurface8 *original_ds, *original_rt, *rt;
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
index 6b30f3e..affd416 100644
--- a/dlls/d3d9/tests/visual.c
+++ b/dlls/d3d9/tests/visual.c
@@ -11099,7 +11099,7 @@ static void intz_test(IDirect3DDevice9 *device)
         0x02000001, 0x80010001, 0x80e40000,                                     /* mov r1.x, r0                 */
         0x03010042, 0x800f0000, 0xb0e40000, 0xa0e40800,                         /* texldp r0, t0, s0            */
         0x02000001, 0x80020001, 0x80000000,                                     /* mov r1.y, r0.x               */
-        0x02000001, 0x800f0800, 0x80e40001,                                     /* mov 0C0, r1                  */
+        0x02000001, 0x800f0800, 0x80e40001,                                     /* mov oC0, r1                  */
         0x0000ffff,                                                             /* end                          */
     };
     struct
@@ -11109,10 +11109,10 @@ static void intz_test(IDirect3DDevice9 *device)
     }
     quad[] =
     {
-        { -1.0f,  1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.0f},
-        {  1.0f,  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.0f},
-        { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 1.0f},
-        {  1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 1.0f},
+        { -1.0f,  1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f},
+        {  1.0f,  1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f},
+        { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f},
+        {  1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f},
     };
     struct
     {
@@ -11121,14 +11121,14 @@ static void intz_test(IDirect3DDevice9 *device)
     }
     expected_colors[] =
     {
-        {400,  60, D3DCOLOR_ARGB(0x00, 0x9f, 0xff, 0x00)},
-        {560, 180, D3DCOLOR_ARGB(0x00, 0xdf, 0x55, 0x00)},
-        {560, 300, D3DCOLOR_ARGB(0x00, 0xdf, 0x66, 0x00)},
-        {400, 420, D3DCOLOR_ARGB(0x00, 0x9f, 0xb6, 0x00)},
-        {240, 420, D3DCOLOR_ARGB(0x00, 0x60, 0x6d, 0x00)},
-        { 80, 300, D3DCOLOR_ARGB(0x00, 0x20, 0x33, 0x00)},
-        { 80, 180, D3DCOLOR_ARGB(0x00, 0x20, 0x55, 0x00)},
-        {240,  60, D3DCOLOR_ARGB(0x00, 0x60, 0xff, 0x00)},
+        { 80, 100, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)},
+        {240, 100, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)},
+        {400, 100, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)},
+        {560, 100, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)},
+        { 80, 450, D3DCOLOR_ARGB(0x00, 0x20, 0x40, 0x00)},
+        {240, 450, D3DCOLOR_ARGB(0x00, 0x60, 0xbf, 0x00)},
+        {400, 450, D3DCOLOR_ARGB(0x00, 0x9f, 0x40, 0x00)},
+        {560, 450, D3DCOLOR_ARGB(0x00, 0xdf, 0xbf, 0x00)},
     };

IDirect3DSurface9 *original_ds, *original_rt, *rt;