Avoid triangle fans in reinterpolation consistency tests

These causes problems for portability implementations and are not needed
for the test itself. This commit replaces them with triangle strips.

Affected tests:
dEQP-VK.pipeline.multisample_interpolation.reinterpolation_consistency.interpolate_at_centroid
dEQP-VK.pipeline.multisample_interpolation.reinterpolation_consistency.interpolate_at_sample

Components: Vulkan
VK-GL-CTS issue: 3545

Change-Id: I29aae73b8a74795b5297eb546a1d150a61e82c33

diff --git a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber
index e251c79ef57aa3f915c989a9ea4f9fc5ea52e37d..9374218e11702f6cf876feeb89b68cad57a99ea0 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber
+++ b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber
@@ -28,16 +28,16 @@ void main (void)
 }
 END
 BUFFER position DATA_TYPE vec4<float> DATA
--1.0 -1.0 0.0 1.0
  1.0 -1.0 0.0 1.0
  1.0  1.0 0.0 1.0
+-1.0 -1.0 0.0 1.0
 -1.0  1.0 0.0 1.0
 END
 BUFFER position_screen DATA_TYPE float DATA
- 0.0
 64.0
 64.0
  0.0
+ 0.0
 END
 BUFFER framebuffer FORMAT B8G8R8A8_UNORM
 PIPELINE graphics pipeline
@@ -48,5 +48,5 @@ PIPELINE graphics pipeline
   BIND BUFFER framebuffer AS color LOCATION 0
   FRAMEBUFFER_SIZE 64 64
 END
-RUN pipeline DRAW_ARRAY AS TRIANGLE_FAN START_IDX 0 COUNT 4
+RUN pipeline DRAW_ARRAY AS TRIANGLE_STRIP START_IDX 0 COUNT 4
 EXPECT framebuffer IDX 0 0 SIZE 64 64 EQ_RGBA 0 255 0 255

diff --git a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber
index 56b0cab34c2256e9a9d3ff9f60b666e4b7b59034..2d1b6f2449db68cf49b32f39ccb1790a7798eeba 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber
+++ b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber
@@ -28,16 +28,16 @@ void main (void)
 }
 END
 BUFFER position DATA_TYPE vec4<float> DATA
--1.0 -1.0 0.0 1.0
  1.0 -1.0 0.0 1.0
  1.0  1.0 0.0 1.0
+-1.0 -1.0 0.0 1.0
 -1.0  1.0 0.0 1.0
 END
 BUFFER position_screen DATA_TYPE float DATA
- 0.0
 64.0
 64.0
  0.0
+ 0.0
 END
 BUFFER framebuffer FORMAT B8G8R8A8_UNORM
 PIPELINE graphics pipeline
@@ -48,5 +48,5 @@ PIPELINE graphics pipeline
   BIND BUFFER framebuffer AS color LOCATION 0
   FRAMEBUFFER_SIZE 64 64
 END
-RUN pipeline DRAW_ARRAY AS TRIANGLE_FAN START_IDX 0 COUNT 4
+RUN pipeline DRAW_ARRAY AS TRIANGLE_STRIP START_IDX 0 COUNT 4
 EXPECT framebuffer IDX 0 0 SIZE 64 64 EQ_RGBA 0 255 0 255