[Piglit] [PATCH] ssbo/shared: fix min/max tests to specify std430

Ian Romanick idr at freedesktop.org
Wed Jun 26 16:54:41 UTC 2019


Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

On 6/25/19 7:23 PM, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 
> These tests preinit the ssbo contents but expect the driver to
> be doing std430 packing by default, just specify std430 packing.
> ---
>  .../execution/shared-atomicMax-int.shader_test                  | 2 +-
>  .../execution/shared-atomicMax-uint.shader_test                 | 2 +-
>  .../execution/shared-atomicMin-int.shader_test                  | 2 +-
>  .../execution/shared-atomicMin-uint.shader_test                 | 2 +-
>  .../execution/ssbo-atomicMax-int.shader_test                    | 2 +-
>  .../execution/ssbo-atomicMax-uint.shader_test                   | 2 +-
>  .../execution/ssbo-atomicMin-int.shader_test                    | 2 +-
>  .../execution/ssbo-atomicMin-uint.shader_test                   | 2 +-
>  8 files changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/tests/spec/arb_compute_shader/execution/shared-atomicMax-int.shader_test b/tests/spec/arb_compute_shader/execution/shared-atomicMax-int.shader_test
> index 642e417d0..cc2abc2c0 100644
> --- a/tests/spec/arb_compute_shader/execution/shared-atomicMax-int.shader_test
> +++ b/tests/spec/arb_compute_shader/execution/shared-atomicMax-int.shader_test
> @@ -13,7 +13,7 @@ GL_ARB_shader_atomic_counters
>  
>  layout(local_size_x = 64) in;
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	int source_array[64];
>  	int source_value;
>  };
> diff --git a/tests/spec/arb_compute_shader/execution/shared-atomicMax-uint.shader_test b/tests/spec/arb_compute_shader/execution/shared-atomicMax-uint.shader_test
> index 8264653e0..a228ecc73 100644
> --- a/tests/spec/arb_compute_shader/execution/shared-atomicMax-uint.shader_test
> +++ b/tests/spec/arb_compute_shader/execution/shared-atomicMax-uint.shader_test
> @@ -13,7 +13,7 @@ GL_ARB_shader_atomic_counters
>  
>  layout(local_size_x = 64) in;
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	uint source_array[64];
>  	uint source_value;
>  };
> 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 c06bd0ed3..ddaa1588f 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
> @@ -13,7 +13,7 @@ GL_ARB_shader_atomic_counters
>  
>  layout(local_size_x = 64) in;
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	int source_array[64];
>  	int source_value;
>  };
> 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 93b799327..d1dd6cdea 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
> @@ -13,7 +13,7 @@ GL_ARB_shader_atomic_counters
>  
>  layout(local_size_x = 64) in;
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	uint source_array[64];
>  	uint source_value;
>  };
> diff --git a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-int.shader_test b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-int.shader_test
> index b7d59a328..29f181799 100644
> --- a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-int.shader_test
> +++ b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-int.shader_test
> @@ -11,7 +11,7 @@ GL_ARB_shader_atomic_counters
>  #extension GL_ARB_shader_storage_buffer_object: require
>  #extension GL_ARB_shader_atomic_counters: require
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	int array[64];
>  	int value;
>  };
> diff --git a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-uint.shader_test b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-uint.shader_test
> index c65600fad..e0da2bf88 100644
> --- a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-uint.shader_test
> +++ b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMax-uint.shader_test
> @@ -11,7 +11,7 @@ GL_ARB_shader_atomic_counters
>  #extension GL_ARB_shader_storage_buffer_object: require
>  #extension GL_ARB_shader_atomic_counters: require
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	uint array[64];
>  	uint value;
>  };
> diff --git a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-int.shader_test b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-int.shader_test
> index ca83af48a..422782c2b 100644
> --- a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-int.shader_test
> +++ b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-int.shader_test
> @@ -12,7 +12,7 @@ GL_ARB_shader_atomic_counters
>  #extension GL_ARB_shader_atomic_counters: require
>  
>  #line 100
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	int array[64];
>  	int value;
>  };
> diff --git a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-uint.shader_test b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-uint.shader_test
> index fbae509d8..8af265c60 100644
> --- a/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-uint.shader_test
> +++ b/tests/spec/arb_shader_storage_buffer_object/execution/ssbo-atomicMin-uint.shader_test
> @@ -11,7 +11,7 @@ GL_ARB_shader_atomic_counters
>  #extension GL_ARB_shader_storage_buffer_object: require
>  #extension GL_ARB_shader_atomic_counters: require
>  
> -layout(binding = 0) buffer bufblock {
> +layout(binding = 0, std430) buffer bufblock {
>  	uint array[64];
>  	uint value;
>  };
> 



More information about the Piglit mailing list