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 981dec4986e7ac1982049dbede1ca2aa72f5e70c.

Browse Source
This commit is contained in:
Sebastian Lackner
2017-10-27 19:40:52 +02:00
parent e3089157b4
commit a8a83ab795
11 changed files with 90 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
patches/wined3d-Interpolation_Modifiers/0001-d3d11-tests-Add-test-for-nointerpolation-modifier.patch
View File

@@ -1,4 +1,4 @@
From bf007492515532cf1b5d8a468e2363fbaad931fd Mon Sep 17 00:00:00 2001
From 2956c590a5d4c5cc205e94b1e2f31be1f71c9350 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 8 Sep 2017 00:06:15 +0200
Subject: d3d11/tests: Add test for nointerpolation modifier.
@@ -8,10 +8,10 @@ Subject: d3d11/tests: Add test for nointerpolation modifier.
1 file changed, 195 insertions(+)
diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c
index bdd542651c0..1fdf26715b0 100644
index 7df2d3789a4..63188c4fe89 100644
--- a/dlls/d3d11/tests/d3d11.c
+++ b/dlls/d3d11/tests/d3d11.c
@@ -21609,6 +21609,200 @@ static void test_dual_blending(void)
@@ -22867,6 +22867,200 @@ static void test_mipmap_generation(void)
release_test_context(&test_context);
}
@@ -184,21 +184,21 @@ index bdd542651c0..1fdf26715b0 100644
+ color = get_texture_color(render_target, 640, 0);
+ ok(compare_color(color, 0xffffffff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 320, 2);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 0, 479);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 639, 479);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 319, 479);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 319, 400);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 319, 200);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 350, 300);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ color = get_texture_color(render_target, 320, 300);
+ todo_wine ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+ ok(compare_color(color, 0xff0000ff, 1), "Got unexpected color 0x%08x.\n", color);
+
+ ID3D11InputLayout_Release(input_layout);
+ ID3D11RenderTargetView_Release(rtv[1]);
@@ -212,12 +212,12 @@ index bdd542651c0..1fdf26715b0 100644
START_TEST(d3d11)
{
test_create_device();
@@ -21712,4 +21906,5 @@ START_TEST(d3d11)
test_early_depth_stencil();
@@ -22975,4 +23169,5 @@ START_TEST(d3d11)
test_conservative_depth_output();
test_dual_blending();
test_mipmap_generation();
+ test_interpolation();
}
--
2.14.1
2.14.2

1
patches/wined3d-Interpolation_Modifiers/definition
View File

@@ -1,2 +1,3 @@
Fixes: [43239] Implement support for interpolation modifiers in sm4/sm5 pixel shaders
Depends: wined3d-Dual_Source_Blending
Disabled: true