[Piglit] [PATCH] intel_shader_atomic_float_minmax: Explicitly request std430 layout

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

These tests preinit the ssbo contents but expect the driver to be doing
std430 packing by default, just specify std430 packing.

Edits done by:

grep -lr ' buffer ' tests/spec/intel_shader_atomic_float_minmax/execution |\
    while read f; do
        sed --in-place -e 's/layout(binding = 0) buffer/layout(binding = 0, std430) buffer/' $f
    done
---
 .../execution/shared-atomicMax-float.shader_test                | 2 +-
 .../execution/shared-atomicMin-float.shader_test                | 2 +-
 .../execution/ssbo-atomicCompSwap-float-NaN.shader_test         | 2 +-
 .../ssbo-atomicCompSwap-float-negative-zero.shader_test         | 2 +-
 .../execution/ssbo-atomicCompSwap-float.shader_test             | 2 +-
 .../execution/ssbo-atomicExchange-float.shader_test             | 2 +-
 .../execution/ssbo-atomicMax-float-NaN.shader_test              | 2 +-
 .../execution/ssbo-atomicMax-float.shader_test                  | 2 +-
 .../execution/ssbo-atomicMin-float-NaN.shader_test              | 2 +-
 .../execution/ssbo-atomicMin-float.shader_test                  | 2 +-
 10 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMax-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMax-float.shader_test
index 2dde8c713..60bedd4f9 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMax-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMax-float.shader_test
@@ -15,7 +15,7 @@ GL_INTEL_shader_atomic_float_minmax
 
 layout(local_size_x = 64) in;
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float source_array[64];
 	float source_value;
 };
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test
index ac2a740cd..40a2ddd30 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test
@@ -15,7 +15,7 @@ GL_INTEL_shader_atomic_float_minmax
 
 layout(local_size_x = 64) in;
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float source_array[64];
 	float source_value;
 };
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-NaN.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-NaN.shader_test
index 5919f1c15..0ad13b742 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-NaN.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-NaN.shader_test
@@ -10,7 +10,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_storage_buffer_object: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float value[8];
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-negative-zero.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-negative-zero.shader_test
index 3b16acc34..608ca40dd 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-negative-zero.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-negative-zero.shader_test
@@ -14,7 +14,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_atomic_counter_ops: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float value[8];
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float.shader_test
index 008d067aa..fe3c956be 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float.shader_test
@@ -16,7 +16,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_gpu_shader5: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float value;
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicExchange-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicExchange-float.shader_test
index cfe19bd81..361a9e988 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicExchange-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicExchange-float.shader_test
@@ -15,7 +15,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_atomic_counter_ops: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
        float value;
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float-NaN.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float-NaN.shader_test
index 7fb20a98f..527de10eb 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float-NaN.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float-NaN.shader_test
@@ -12,7 +12,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_storage_buffer_object: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float value[1024];
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float.shader_test
index 319997e96..44aadbc9e 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float.shader_test
@@ -13,7 +13,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_atomic_counters: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float array[64];
 	float value;
 };
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float-NaN.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float-NaN.shader_test
index fe531abf5..f34753610 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float-NaN.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float-NaN.shader_test
@@ -12,7 +12,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_storage_buffer_object: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float value[1024];
 };
 
diff --git a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float.shader_test b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float.shader_test
index de5c87e0a..c9b7fdbbc 100644
--- a/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float.shader_test
+++ b/tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float.shader_test
@@ -13,7 +13,7 @@ GL_INTEL_shader_atomic_float_minmax
 #extension GL_ARB_shader_atomic_counters: require
 #extension GL_INTEL_shader_atomic_float_minmax: require
 
-layout(binding = 0) buffer bufblock {
+layout(binding = 0, std430) buffer bufblock {
 	float array[64];
 	float value;
 };
-- 
2.21.0