Reduce resolution of some graphicsfuzz tests
These tests have a lot of shader computation, which may exceed a 30
second watchdog time limit. Reducing the resolution should allow them to
complete quickly on low-end devices.
Affects:
dEQP-VK.graphicsfuzz.nested-for-loops-switch-fallthrough
dEQP-VK.graphicsfuzz.spv-access-chains
dEQP-VK.graphicsfuzz.spv-copy-object
dEQP-VK.graphicsfuzz.spv-dead-break-and-unroll
dEQP-VK.graphicsfuzz.spv-stable-maze-flatten-copy-composite
Components: Vulkan
Change-Id: I4ca78ae1beafb3d892d437568f10cc816ae79df2
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/vulkan-cts/+/694205
Reviewed-by: John Bauman <jbauman@google.com>
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-switch-fallthrough.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-switch-fallthrough.amber
index 7cbee38..91b2100 100644
--- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-switch-fallthrough.amber
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/nested-for-loops-switch-fallthrough.amber
@@ -543,13 +543,13 @@
PIPELINE graphics variant_pipeline
ATTACH variant_vertex_shader
ATTACH variant_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER variant_framebuffer AS color LOCATION 0
BIND BUFFER variant_zero AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_pipeline 0 0 0 255
CLEAR variant_pipeline
-RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 64 64
-EXPECT variant_framebuffer IDX 0 0 SIZE 256 256 EQ_RGBA 255 0 0 255
+EXPECT variant_framebuffer IDX 0 0 SIZE 64 64 EQ_RGBA 255 0 0 255
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-access-chains.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-access-chains.amber
index 4960622..fa77d83 100644
--- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-access-chains.amber
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-access-chains.amber
@@ -644,7 +644,7 @@
# resolution
BUFFER reference_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER reference_framebuffer FORMAT B8G8R8A8_UNORM
@@ -652,14 +652,14 @@
PIPELINE graphics reference_pipeline
ATTACH reference_vertex_shader
ATTACH reference_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER reference_framebuffer AS color LOCATION 0
BIND BUFFER reference_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR reference_pipeline 0 0 0 255
CLEAR reference_pipeline
-RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 64 64
SHADER vertex variant_vertex_shader PASSTHROUGH
@@ -1287,7 +1287,7 @@
# resolution
BUFFER variant_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER variant_framebuffer FORMAT B8G8R8A8_UNORM
@@ -1295,13 +1295,13 @@
PIPELINE graphics variant_pipeline
ATTACH variant_vertex_shader
ATTACH variant_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER variant_framebuffer AS color LOCATION 0
BIND BUFFER variant_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_pipeline 0 0 0 255
CLEAR variant_pipeline
-RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 64 64
EXPECT reference_framebuffer EQ_HISTOGRAM_EMD_BUFFER variant_framebuffer TOLERANCE 0.005
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-copy-object.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-copy-object.amber
index 7286518..fa4af4a 100644
--- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-copy-object.amber
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-copy-object.amber
@@ -644,7 +644,7 @@
# resolution
BUFFER reference_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER reference_framebuffer FORMAT B8G8R8A8_UNORM
@@ -652,14 +652,14 @@
PIPELINE graphics reference_pipeline
ATTACH reference_vertex_shader
ATTACH reference_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER reference_framebuffer AS color LOCATION 0
BIND BUFFER reference_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR reference_pipeline 0 0 0 255
CLEAR reference_pipeline
-RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 64 64
SHADER vertex variant_vertex_shader PASSTHROUGH
@@ -1288,7 +1288,7 @@
# resolution
BUFFER variant_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER variant_framebuffer FORMAT B8G8R8A8_UNORM
@@ -1296,13 +1296,13 @@
PIPELINE graphics variant_pipeline
ATTACH variant_vertex_shader
ATTACH variant_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER variant_framebuffer AS color LOCATION 0
BIND BUFFER variant_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_pipeline 0 0 0 255
CLEAR variant_pipeline
-RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 64 64
EXPECT reference_framebuffer EQ_HISTOGRAM_EMD_BUFFER variant_framebuffer TOLERANCE 0.005
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-dead-break-and-unroll.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-dead-break-and-unroll.amber
index 6bf3d19..07d752d 100644
--- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-dead-break-and-unroll.amber
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-dead-break-and-unroll.amber
@@ -644,7 +644,7 @@
# resolution
BUFFER reference_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER reference_framebuffer FORMAT B8G8R8A8_UNORM
@@ -652,14 +652,14 @@
PIPELINE graphics reference_pipeline
ATTACH reference_vertex_shader
ATTACH reference_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER reference_framebuffer AS color LOCATION 0
BIND BUFFER reference_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR reference_pipeline 0 0 0 255
CLEAR reference_pipeline
-RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 64 64
SHADER vertex variant_vertex_shader PASSTHROUGH
@@ -1296,7 +1296,7 @@
# resolution
BUFFER variant_resolution DATA_TYPE vec2<float> DATA
- 256.0 256.0
+ 64.0 64.0
END
BUFFER variant_framebuffer FORMAT B8G8R8A8_UNORM
@@ -1304,13 +1304,13 @@
PIPELINE graphics variant_pipeline
ATTACH variant_vertex_shader
ATTACH variant_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 64 64
BIND BUFFER variant_framebuffer AS color LOCATION 0
BIND BUFFER variant_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_pipeline 0 0 0 255
CLEAR variant_pipeline
-RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 64 64
EXPECT reference_framebuffer EQ_HISTOGRAM_EMD_BUFFER variant_framebuffer TOLERANCE 0.005
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-stable-maze-flatten-copy-composite.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-stable-maze-flatten-copy-composite.amber
index eadf828..303cc8d 100644
--- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-stable-maze-flatten-copy-composite.amber
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/spv-stable-maze-flatten-copy-composite.amber
@@ -647,7 +647,7 @@
# resolution
BUFFER reference_resolution DATA_TYPE vec2<float> STD140 DATA
- 256.0 256.0
+ 32.0 32.0
END
BUFFER reference_framebuffer FORMAT B8G8R8A8_UNORM
@@ -655,14 +655,14 @@
PIPELINE graphics reference_pipeline
ATTACH reference_vertex_shader
ATTACH reference_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 32 32
BIND BUFFER reference_framebuffer AS color LOCATION 0
BIND BUFFER reference_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR reference_pipeline 0 0 0 255
CLEAR reference_pipeline
-RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN reference_pipeline DRAW_RECT POS 0 0 SIZE 32 32
SHADER vertex variant_vertex_shader PASSTHROUGH
@@ -1341,7 +1341,7 @@
# resolution
BUFFER variant_resolution DATA_TYPE vec2<float> STD140 DATA
- 256.0 256.0
+ 32.0 32.0
END
BUFFER variant_framebuffer FORMAT B8G8R8A8_UNORM
@@ -1349,14 +1349,14 @@
PIPELINE graphics variant_pipeline
ATTACH variant_vertex_shader
ATTACH variant_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 32 32
BIND BUFFER variant_framebuffer AS color LOCATION 0
BIND BUFFER variant_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_pipeline 0 0 0 255
CLEAR variant_pipeline
-RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 32 32
SHADER vertex variant_2_vertex_shader PASSTHROUGH
@@ -1990,7 +1990,7 @@
# resolution
BUFFER variant_2_resolution DATA_TYPE vec2<float> STD140 DATA
- 256.0 256.0
+ 32.0 32.0
END
BUFFER variant_2_framebuffer FORMAT B8G8R8A8_UNORM
@@ -1998,14 +1998,14 @@
PIPELINE graphics variant_2_pipeline
ATTACH variant_2_vertex_shader
ATTACH variant_2_fragment_shader
- FRAMEBUFFER_SIZE 256 256
+ FRAMEBUFFER_SIZE 32 32
BIND BUFFER variant_2_framebuffer AS color LOCATION 0
BIND BUFFER variant_2_resolution AS uniform DESCRIPTOR_SET 0 BINDING 0
END
CLEAR_COLOR variant_2_pipeline 0 0 0 255
CLEAR variant_2_pipeline
-RUN variant_2_pipeline DRAW_RECT POS 0 0 SIZE 256 256
+RUN variant_2_pipeline DRAW_RECT POS 0 0 SIZE 32 32
EXPECT reference_framebuffer EQ_HISTOGRAM_EMD_BUFFER variant_framebuffer TOLERANCE 0.005
EXPECT reference_framebuffer EQ_HISTOGRAM_EMD_BUFFER variant_2_framebuffer TOLERANCE 0.005
