[Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables
From: Nicolai Hähnle Without those, many of the tests started failing now that Mesa explicitly checks for the compute shader enable in the compiler. --- tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp | 1 + .../compiler/gl_LocalGroupSizeARB_illegal_use.comp | 1 + .../compiler/gl_LocalGroupSizeARB_layout.comp | 1 + tests/spec/arb_compute_variable_group_size/errors.c | 1 + .../execution/basic-local-size.shader_test | 1 + .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 ++ .../linker/no_local_size_specified.shader_test | 2 ++ tests/spec/arb_compute_variable_group_size/local-size.c | 1 + 8 files changed, 10 insertions(+) diff --git a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp index 95c061b..ae2e973 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp @@ -1,14 +1,15 @@ // [config] // expect_result: pass // glsl_version: 3.30 // require_extensions: GL_ARB_compute_variable_group_size // [end config] #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { } diff --git a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp index f8fcf92..5eb8f4d 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp @@ -11,18 +11,19 @@ // example, a shader might want to declare a shared variable with one // instance per work group invocation, such as: // // shared float shared_values[gl_WorkGroupSize.x * //gl_WorkGroupSize.y * gl_WorkGroupSize.z]; // // Such declarations would be illegal using the input // "gl_LocalGroupSizeARB". #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { uint v[gl_LocalGroupSizeARB.x]; } diff --git a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp index 953856e..d575001 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp @@ -10,18 +10,19 @@ // variable containing the local work group size for the current compute- // shader work group. For compute shaders with a fixed local group size // (using *local_size_x*, *local_size_y*, or *local_size_z* layout // qualifiers), its value will be the same as the constant // /gl_WorkGroupSize/. For compute shaders with a variable local group size // (using *local_size_variable*), the value of /gl_LocalGroupSizeARB/ will // be the work group size specified in the OpenGL API command dispatching // the current compute shader work. #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { uvec3 size = gl_LocalGroupSizeARB; } diff --git a/tests/spec/arb_compute_variable_group_size/errors.c b/tests/spec/arb_compute_variable_group_size/errors.c index 19945d1..82bae42 100644 --- a/tests/spec/arb_compute_variable_group_size/errors.c +++ b/tests/spec/arb_compute_variable_group_size/errors.c @@ -35,20 +35,21 @@ static struct piglit_gl_test_config *piglit_config; PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = &config; config.supports_gl_compat_version = 33; config.supports_gl_core_version = 33; PIGLIT_GL_TEST_CONFIG_END static const char *variable_work_group_size_shader = "#version 330\n" + "#extension GL_ARB_compute_shader: enable\n" "#extension GL_ARB_compute_variable_group_size: enable\n" "\n" "layout(local_size_variable) in;\n" "\n" "void main()\n" "{\n" "}\n"; static const char *fixed_work_group_size_shader = "#version 330\n" diff --git a/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test b/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test index 108ebd5..75c93f7 100644 --- a/tests/spec/arb_compute_variable_group_size/execution/basic-local-size.shader_test +++ b/tests/spec/arb_compute_variable_group_size/execution/basic-local-siz
Re: [Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables
On 10/17/2016 09:38 PM, Nicolai Hähnle wrote: From: Nicolai Hähnle Without those, many of the tests started failing now that Mesa explicitly checks for the compute shader enable in the compiler. Well, ARB_compute_variable_group_size requires ARB_compute_shader, that's why I didn't check it initially. But if mesa now checks for compute shaders availability, this makes sense. Your patch will conflict with Matt's one though, but this looks better to me actually. Reviewed-by: Samuel Pitoiset --- tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp | 1 + .../compiler/gl_LocalGroupSizeARB_illegal_use.comp | 1 + .../compiler/gl_LocalGroupSizeARB_layout.comp | 1 + tests/spec/arb_compute_variable_group_size/errors.c | 1 + .../execution/basic-local-size.shader_test | 1 + .../linker/mixed_fixed_variable_local_work_size.shader_test | 2 ++ .../linker/no_local_size_specified.shader_test | 2 ++ tests/spec/arb_compute_variable_group_size/local-size.c | 1 + 8 files changed, 10 insertions(+) diff --git a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp index 95c061b..ae2e973 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/do_nothing.comp @@ -1,14 +1,15 @@ // [config] // expect_result: pass // glsl_version: 3.30 // require_extensions: GL_ARB_compute_variable_group_size // [end config] #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { } diff --git a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp index f8fcf92..5eb8f4d 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_illegal_use.comp @@ -11,18 +11,19 @@ // example, a shader might want to declare a shared variable with one // instance per work group invocation, such as: // // shared float shared_values[gl_WorkGroupSize.x * //gl_WorkGroupSize.y * gl_WorkGroupSize.z]; // // Such declarations would be illegal using the input // "gl_LocalGroupSizeARB". #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { uint v[gl_LocalGroupSizeARB.x]; } diff --git a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp index 953856e..d575001 100644 --- a/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp +++ b/tests/spec/arb_compute_variable_group_size/compiler/gl_LocalGroupSizeARB_layout.comp @@ -10,18 +10,19 @@ // variable containing the local work group size for the current compute- // shader work group. For compute shaders with a fixed local group size // (using *local_size_x*, *local_size_y*, or *local_size_z* layout // qualifiers), its value will be the same as the constant // /gl_WorkGroupSize/. For compute shaders with a variable local group size // (using *local_size_variable*), the value of /gl_LocalGroupSizeARB/ will // be the work group size specified in the OpenGL API command dispatching // the current compute shader work. #version 330 +#extension GL_ARB_compute_shader: enable #extension GL_ARB_compute_variable_group_size: enable layout(local_size_variable) in; void main() { uvec3 size = gl_LocalGroupSizeARB; } diff --git a/tests/spec/arb_compute_variable_group_size/errors.c b/tests/spec/arb_compute_variable_group_size/errors.c index 19945d1..82bae42 100644 --- a/tests/spec/arb_compute_variable_group_size/errors.c +++ b/tests/spec/arb_compute_variable_group_size/errors.c @@ -35,20 +35,21 @@ static struct piglit_gl_test_config *piglit_config; PIGLIT_GL_TEST_CONFIG_BEGIN piglit_config = &config; config.supports_gl_compat_version = 33; config.supports_gl_core_version = 33; PIGLIT_GL_TEST_CONFIG_END static const char *variable_work_group_size_shader = "#version 330\n" + "#extension GL_ARB_compute_shader: enable\n" "#extension GL_ARB_compute_variable_group_size: enable\n" "\n" "layout(local_size_variable) in;\n" "\n" "void main()\n" "{\n" "}\n"; static const char *fixed_work_group_size_shader = "#version 330\n" diff --git a/tests/spec/arb_
Re: [Piglit] [PATCH] arb_compute_variable_group_size: add ARB_compute_shader enables
On Mon, Oct 17, 2016 at 12:38 PM, Nicolai Hähnle wrote: > From: Nicolai Hähnle > > Without those, many of the tests started failing now that Mesa explicitly > checks for the compute shader enable in the compiler. > --- The strange thing is that ARB_compute_shader doesn't say anything about an #extension GL_ARB_compute_shader. I suppose it's just an oversight. I'll commit my patch, since it should just add the dependency on GL_ARB_compute_variable_group_size with Samuel's feedback incorporated. I have no problem with this patch. ___ Piglit mailing list Piglit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/piglit