wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 53290d2ec483006656987352d53842ffc1852c91.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-11-21 09:51:39 +01:00
parent ad21b3e74b
commit aa9bb78434
5 changed files with 35 additions and 383 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
patches/d3dx9_36-Tests/0001-d3dx9_36-tests-Fix-some-test-failures.patch
View File

@@ -1,17 +1,17 @@
From 69c020763f71d57ada7d5670883b36add6444039 Mon Sep 17 00:00:00 2001
From 227e86c26da931222508fab0b175db09ce1b4ce2 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 May 2017 01:32:51 +0200
Subject: d3dx9_36/tests: Fix some test failures.
---
dlls/d3dx9_36/tests/math.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
dlls/d3dx9_36/tests/math.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/tests/math.c b/dlls/d3dx9_36/tests/math.c
index 3843abea9be..d21a229bbbe 100644
index 0e9853abe38..8bc462c48a4 100644
--- a/dlls/d3dx9_36/tests/math.c
+++ b/dlls/d3dx9_36/tests/math.c
@@ -232,7 +232,7 @@ static void D3DXColorTest(void)
@@ -244,7 +244,7 @@ static void D3DXColorTest(void)
/*_______________D3DXColorLerp________________*/
expected.r = 0.32f; expected.g = 0.69f; expected.b = 0.356f; expected.a = 0.897f;
D3DXColorLerp(&got,&color,&color1,scale);
@@ -20,16 +20,7 @@ index 3843abea9be..d21a229bbbe 100644
/* Test the NULL case */
funcpointer = D3DXColorLerp(&got,NULL,&color1,scale);
ok(funcpointer == NULL, "Expected: %p, Got: %p\n", NULL, funcpointer);
@@ -302,7 +302,7 @@ static void D3DXFresnelTest(void)
BOOL equal;
fresnel = D3DXFresnelTerm(0.5f, 1.5f);
- equal = compare_float(fresnel, 8.91867056e-02f, 1);
+ equal = compare_float(fresnel, 8.91867056e-02f, 2);
ok(equal, "Got unexpected Fresnel term %.8e.\n", fresnel);
}
@@ -2947,7 +2947,7 @@ static void test_D3DXSHEvalDirectionalLight(void)
@@ -2994,7 +2994,7 @@ static void test_D3DXSHEvalDirectionalLight(void)
expected = j + test[l].boffset;
else
expected = test[l].blue_out[startindex + j];
@@ -38,7 +29,7 @@ index 3843abea9be..d21a229bbbe 100644
ok(equal, "Blue: case %u, order %u: expected[%u] = %.8e, received %.8e.\n",
l, order, j, expected, blue_out[j]);
}
@@ -3292,7 +3292,7 @@ static void test_D3DXSHMultiply3(void)
@@ -3339,7 +3339,7 @@ static void test_D3DXSHMultiply3(void)
D3DXSHMultiply3(c, c, b);
for (i = 0; i < ARRAY_SIZE(expected_aliased); ++i)
{
@@ -48,5 +39,5 @@ index 3843abea9be..d21a229bbbe 100644
}
}
--
2.12.2
2.14.2