[Mesa-dev] [PATCH] mesa: support compute stage in _mesa_program_resource_prop

[Matt Turner]

On Tue, May 5, 2015 at 11:36 PM, Tapani Pälli <tapani.palli at intel.com> wrote:
> Increases pass rate of ES31-CTS.*program_interface_query* tests
> when run with MESA_EXTENSION_OVERRIDE='GL_ARB_compute_shader'. Many
> of the negative tests that happen to use compute stage in queries
> start passing.
>
> Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
> ---
>  src/mesa/main/shader_query.cpp | 22 ++++++++++++++++------
>  1 file changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp
> index d2ca49b..6e46553 100644
> --- a/src/mesa/main/shader_query.cpp
> +++ b/src/mesa/main/shader_query.cpp
> @@ -809,6 +809,8 @@ stage_from_enum(GLenum ref)
>        return MESA_SHADER_GEOMETRY;
>     case GL_REFERENCED_BY_FRAGMENT_SHADER:
>        return MESA_SHADER_FRAGMENT;
> +   case GL_REFERENCED_BY_COMPUTE_SHADER:
> +      return MESA_SHADER_COMPUTE;
>     default:
>        assert(!"shader stage not supported");
>        return MESA_SHADER_STAGES;
> @@ -824,6 +826,10 @@ is_resource_referenced(struct gl_shader_program *shProg,
>                         struct gl_program_resource *res,
>                         GLuint index, uint8_t stage)
>  {
> +   /* First, check if we even have such a stage active. */
> +   if (!shProg->_LinkedShaders[stage])
> +      return false;
> +
>     if (res->Type == GL_ATOMIC_COUNTER_BUFFER)
>        return RESOURCE_ATC(res)->StageReferences[stage];
>
> @@ -979,6 +985,9 @@ _mesa_program_resource_prop(struct gl_shader_program *shProg,
>     case GL_NUM_ACTIVE_VARIABLES:
>     case GL_ACTIVE_VARIABLES:
>        return get_buffer_property(shProg, res, prop, val, caller);
> +   case GL_REFERENCED_BY_COMPUTE_SHADER:
> +      if (!ctx->Extensions.ARB_compute_shader)
> +         goto invalid_enum;

Again, put a /* fallthrough */ here.

>     case GL_REFERENCED_BY_VERTEX_SHADER:
>     case GL_REFERENCED_BY_GEOMETRY_SHADER:
>     case GL_REFERENCED_BY_FRAGMENT_SHADER: