mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
d3d9-Tests: Remove patch set.
No information is provided as to what cards or driver trigger the failures; assume they are not relevant any longer until proven otherwise.
This commit is contained in:
Zebediah Figura
parent
47facf2571
commit
d53a1b4a17
@ -1,61 +0,0 @@
|
||||
From a568780e076f43ab5a7f07c4eb963e7777f84255 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 15 May 2016 17:05:15 +0200
|
||||
Subject: d3d9/tests: Avoid test failures on specific Nvidia graphic cards.
|
||||
|
||||
---
|
||||
dlls/d3d9/tests/visual.c | 24 +++++++++++++-----------
|
||||
1 file changed, 13 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c
|
||||
index a308311..c3de15e 100644
|
||||
--- a/dlls/d3d9/tests/visual.c
|
||||
+++ b/dlls/d3d9/tests/visual.c
|
||||
@@ -14923,6 +14923,7 @@ static void fp_special_test(void)
|
||||
D3DCOLOR nv40;
|
||||
D3DCOLOR nv50;
|
||||
D3DCOLOR warp;
|
||||
+ D3DCOLOR todo;
|
||||
}
|
||||
vs_body[] =
|
||||
{
|
||||
@@ -14939,17 +14940,17 @@ static void fp_special_test(void)
|
||||
* There are considerable differences between graphics cards in how
|
||||
* these are handled, but pow and nrm never generate INF or NAN on
|
||||
* real hardware. */
|
||||
- {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000},
|
||||
- {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff, 0x00008000},
|
||||
- {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000, 0x00008000},
|
||||
- {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000},
|
||||
- {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000},
|
||||
- {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000},
|
||||
- {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000},
|
||||
- {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000},
|
||||
- {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00, 0x00008000},
|
||||
- {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00, 0x00ff8000},
|
||||
- {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00, 0x00ff8000},
|
||||
+ {"log", vs_log, sizeof(vs_log), 0x00000000, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000, ~0U},
|
||||
+ {"pow", vs_pow, sizeof(vs_pow), 0x000000ff, 0x000000ff, 0x0000ff00, 0x000000ff, 0x00008000, ~0U},
|
||||
+ {"nrm", vs_nrm, sizeof(vs_nrm), 0x00ff0000, 0x00ff0000, 0x0000ff00, 0x00ff0000, 0x00008000, ~0U},
|
||||
+ {"rcp1", vs_rcp1, sizeof(vs_rcp1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000, 0x00ff0000},
|
||||
+ {"rcp2", vs_rcp2, sizeof(vs_rcp2), 0x000000ff, 0x00000000, 0x00ff0000, 0x00ff7f00, 0x00ff8000, ~0U},
|
||||
+ {"rsq1", vs_rsq1, sizeof(vs_rsq1), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000, 0x00ff0000},
|
||||
+ {"rsq2", vs_rsq2, sizeof(vs_rsq2), 0x000000ff, 0x000000ff, 0x00ff00ff, 0x00ff7f00, 0x00ff8000, 0x00ff0000},
|
||||
+ {"lit", vs_lit, sizeof(vs_lit), 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, 0x00ff0000, ~0U},
|
||||
+ {"def1", vs_def1, sizeof(vs_def1), 0x000000ff, 0x00007f00, 0x0000ff00, 0x00007f00, 0x00008000, 0x00000000},
|
||||
+ {"def2", vs_def2, sizeof(vs_def2), 0x00ff0000, 0x00ff7f00, 0x00ff0000, 0x00ff7f00, 0x00ff8000, ~0U},
|
||||
+ {"def3", vs_def3, sizeof(vs_def3), 0x00ff00ff, 0x00ff7f00, 0x00ff00ff, 0x00ff7f00, 0x00ff8000, 0x00ff0000},
|
||||
};
|
||||
|
||||
static const DWORD ps_code[] =
|
||||
@@ -15068,6 +15069,7 @@ static void fp_special_test(void)
|
||||
ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr);
|
||||
|
||||
color = getPixelColor(device, 320, 240);
|
||||
+ todo_wine_if(vs_body[i].todo != ~0U && color_match(color, vs_body[i].todo, 1))
|
||||
ok(color_match(color, vs_body[i].r500, 1)
|
||||
|| color_match(color, vs_body[i].r600, 1)
|
||||
|| color_match(color, vs_body[i].nv40, 1)
|
||||
--
|
||||
2.8.0
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
From 7d03c720e909d4b620bde26ebc78eb4d37557db5 Mon Sep 17 00:00:00 2001
|
||||
From: Christian Costa <titan.costa@gmail.com>
|
||||
Date: Fri, 13 Mar 2015 23:42:20 +0100
|
||||
Subject: d3d9/tests: Avoid crash when surface and texture creation fails.
|
||||
|
||||
---
|
||||
dlls/d3d9/tests/device.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c
|
||||
index 89ea7721bf1..8624ac3153c 100644
|
||||
--- a/dlls/d3d9/tests/device.c
|
||||
+++ b/dlls/d3d9/tests/device.c
|
||||
@@ -8583,8 +8583,14 @@ static void test_surface_blocks(void)
|
||||
break;
|
||||
|
||||
default:
|
||||
+ hr = E_FAIL;
|
||||
break;
|
||||
}
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ skip("Failed to create surface, skipping tests.\n");
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
if (formats[i].block_width > 1)
|
||||
{
|
||||
@@ -9534,6 +9540,11 @@ static void test_volume_blocks(void)
|
||||
hr = IDirect3DDevice9_CreateVolumeTexture(device, 24, 8, 8, 1, 0,
|
||||
formats[i].fmt, D3DPOOL_SCRATCH, &texture, NULL);
|
||||
ok(SUCCEEDED(hr), "Failed to create volume texture, hr %#x.\n", hr);
|
||||
+ if (FAILED(hr))
|
||||
+ {
|
||||
+ skip("Failed to create texture, skipping tests.\n");
|
||||
+ continue;
|
||||
+ }
|
||||
|
||||
/* Test lockrect offset */
|
||||
for (j = 0; j < ARRAY_SIZE(offset_tests); j++)
|
||||
--
|
||||
2.12.2
|
||||
|
||||
@ -103,7 +103,6 @@ patch_enable_all ()
|
||||
enable_cryptext_CryptExtOpenCER="$1"
|
||||
enable_d3d11_Deferred_Context="$1"
|
||||
enable_d3d9_Direct3DShaderValidatorCreate9="$1"
|
||||
enable_d3d9_Tests="$1"
|
||||
enable_d3dx9_32bpp_Alpha_Channel="$1"
|
||||
enable_d3dx9_36_BumpLuminance="$1"
|
||||
enable_d3dx9_36_CloneEffect="$1"
|
||||
@ -432,9 +431,6 @@ patch_enable ()
|
||||
d3d9-Direct3DShaderValidatorCreate9)
|
||||
enable_d3d9_Direct3DShaderValidatorCreate9="$2"
|
||||
;;
|
||||
d3d9-Tests)
|
||||
enable_d3d9_Tests="$2"
|
||||
;;
|
||||
d3dx9-32bpp_Alpha_Channel)
|
||||
enable_d3dx9_32bpp_Alpha_Channel="$2"
|
||||
;;
|
||||
@ -2633,20 +2629,6 @@ if test "$enable_d3d9_Direct3DShaderValidatorCreate9" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3d9-Tests
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/d3d9/tests/device.c, dlls/d3d9/tests/visual.c
|
||||
# |
|
||||
if test "$enable_d3d9_Tests" -eq 1; then
|
||||
patch_apply d3d9-Tests/0001-d3d9-tests-Avoid-test-failures-on-specific-Nvidia-graphic-.patch
|
||||
patch_apply d3d9-Tests/0002-d3d9-tests-Avoid-crash-when-surface-and-texture-crea.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Sebastian Lackner", "d3d9/tests: Avoid test failures on specific Nvidia graphic cards.", 1 },';
|
||||
printf '%s\n' '+ { "Christian Costa", "d3d9/tests: Avoid crash when surface and texture creation fails.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset d3dx9-32bpp_Alpha_Channel
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
Reference in New Issue
Block a user