Reviewed-by: Ian Romanick <ian.d.roman...@intel.com> On 6/25/19 7:15 PM, Dave Airlie wrote: > From: Dave Airlie <airl...@redhat.com> > > These tests preinit the ssbo contents but expect the driver to > be doing std430 packing by default, just specify std430 packing. > > This fixes the tests on softpipe > --- > .../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 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > 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; > }; >
_______________________________________________ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit