summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanylo Piliaiev <danylo.piliaiev@globallogic.com>2020-05-04 17:00:28 +0300
committerDanylo Piliaiev <danylo.piliaiev@globallogic.com>2020-05-04 20:27:25 +0300
commit26376a9d11db1c494139e433afcc416e6c482a2b (patch)
tree918136c98ba39468bdb4ffaf214296ee356456fc
parentcb33e0903ddaef5b2ea2fc7f48371e25df0c7b70 (diff)
Fix several shared-atomicMin* tests using "draw rect" instead of "compute"
Several shader tests called "draw rect" instead of "compute" when testing atomics in compute shader. Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Part-of: <https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/280>
-rw-r--r--tests/spec/arb_compute_shader/execution/shared-atomicMin-int.shader_test6
-rw-r--r--tests/spec/arb_compute_shader/execution/shared-atomicMin-uint.shader_test6
-rw-r--r--tests/spec/intel_shader_atomic_float_minmax/execution/shared-atomicMin-float.shader_test6
3 files changed, 3 insertions, 15 deletions
diff --git a/tests/spec/arb_compute_shader/execution/shared-atomicMin-int.shader_test b/tests/spec/arb_compute_shader/execution/shared-atomicMin-int.shader_test
index ddaa1588f..addeaca80 100644
--- a/tests/spec/arb_compute_shader/execution/shared-atomicMin-int.shader_test
+++ b/tests/spec/arb_compute_shader/execution/shared-atomicMin-int.shader_test
@@ -133,9 +133,5 @@ ssbo 0 subdata int 248 248
ssbo 0 subdata int 252 252
ssbo 0 subdata int 256 5
-clear color 0.5 0.5 0.5 0.5
-clear
-
-draw rect -1 -1 2 2
-
+compute 2 3 4
probe atomic counter 0 == 0
diff --git a/tests/spec/arb_compute_shader/execution/shared-atomicMin-uint.shader_test b/tests/spec/arb_compute_shader/execution/shared-atomicMin-uint.shader_test
index d1dd6cdea..65ca1cf36 100644
--- a/tests/spec/arb_compute_shader/execution/shared-atomicMin-uint.shader_test
+++ b/tests/spec/arb_compute_shader/execution/shared-atomicMin-uint.shader_test
@@ -132,9 +132,5 @@ ssbo 0 subdata int 248 252
ssbo 0 subdata int 252 256
ssbo 0 subdata int 256 3
-clear color 0.5 0.5 0.5 0.5
-clear
-
-draw rect -1 -1 2 2
-
+compute 2 3 4
probe atomic counter 0 == 0
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 40a2ddd30..d7bc6fd2c 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
@@ -135,9 +135,5 @@ ssbo 0 subdata float 248 248
ssbo 0 subdata float 252 252
ssbo 0 subdata float 256 5
-clear color 0.5 0.5 0.5 0.5
-clear
-
-draw rect -1 -1 2 2
-
+compute 2 3 4
probe atomic counter 0 == 0