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 e251c79..9374218 100644
--- a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber
+++ b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_centroid.amber
@@ -28,15 +28,15 @@
 }
 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
+64.0
+64.0
  0.0
-64.0
-64.0
  0.0
 END
 BUFFER framebuffer FORMAT B8G8R8A8_UNORM
@@ -48,5 +48,5 @@
   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 56b0cab..2d1b6f2 100644
--- a/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber
+++ b/external/vulkancts/data/vulkan/amber/pipeline/reinterpolate_at_sample.amber
@@ -28,15 +28,15 @@
 }
 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
+64.0
+64.0
  0.0
-64.0
-64.0
  0.0
 END
 BUFFER framebuffer FORMAT B8G8R8A8_UNORM
@@ -48,5 +48,5 @@
   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