summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Romanick <ian.d.romanick@intel.com>2019-06-26 08:26:36 -0700
committerIan Romanick <ian.d.romanick@intel.com>2019-06-26 08:31:48 -0700
commit3ed0e28c9977a93bddb59edb4ce4c20b19e55cf5 (patch)
treeba2e675562936ee6ce02ac47a18a414b2c929da4
parentba22d921967ae67fb555773eb60cd648e0e9147c (diff)
intel_shader_atomic_float_minmax: Explicitly request std430 layout
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
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMax-float.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-NaN.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float-negative-zero.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicCompSwap-float.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicExchange-float.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float-NaN.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMax-float.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float-NaN.shader_test2
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/ssbo-atomicMin-float.shader_test2
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;
};