[Mesa-dev] [PATCH] mesa/shader_query: add missing subroutines cases

[Antía Puentes]

LGTM:

Reviewed-by: Antia Puentes <apuentes at igalia.com>


On vie, 2016-05-06 at 10:22 +1000, Dave Airlie wrote:
> From: Dave Airlie <airlied at redhat.com>
> 

> ARRAY_SIZE and LOCATION should accept the SUBROUTINE_UNIFORM types.
> 
> Fixes:
> GL43-CTS.program_interface_query.subroutines-vertex
> GL43-CTS.program_interface_query.subroutines-tess-control
> GL43-CTS.program_interface_query.subroutines-tess-eval
> GL43-CTS.program_interface_query.subroutines-geometry
> GL43-CTS.program_interface_query.subroutines-fragment
> GL43-CTS.program_interface_query.subroutines-compute
> 
> Signed-off-by: Dave Airlie <airlied at redhat.com>
> ---
>  src/mesa/main/shader_query.cpp | 13 +++++++++++++
>  1 file changed, 13 insertions(+)
> 
> diff --git a/src/mesa/main/shader_query.cpp
> b/src/mesa/main/shader_query.cpp
> index 020990a..c8c3df4 100644
> --- a/src/mesa/main/shader_query.cpp
> +++ b/src/mesa/main/shader_query.cpp
> @@ -1125,6 +1125,13 @@ _mesa_program_resource_prop(struct
> gl_shader_program *shProg,
>        switch (res->Type) {
>        case GL_UNIFORM:
>        case GL_BUFFER_VARIABLE:
> +      case GL_VERTEX_SUBROUTINE_UNIFORM:
> +      case GL_GEOMETRY_SUBROUTINE_UNIFORM:
> +      case GL_FRAGMENT_SUBROUTINE_UNIFORM:
> +      case GL_COMPUTE_SUBROUTINE_UNIFORM:
> +      case GL_TESS_CONTROL_SUBROUTINE_UNIFORM:
> +      case GL_TESS_EVALUATION_SUBROUTINE_UNIFORM:
> +
>           /* Test if a buffer variable is an array or an unsized
> array.
>            * Unsized arrays return zero as array size.
>            */
> @@ -1207,6 +1214,12 @@ _mesa_program_resource_prop(struct
> gl_shader_program *shProg,
>     case GL_LOCATION:
>        switch (res->Type) {
>        case GL_UNIFORM:
> +      case GL_VERTEX_SUBROUTINE_UNIFORM:
> +      case GL_GEOMETRY_SUBROUTINE_UNIFORM:
> +      case GL_FRAGMENT_SUBROUTINE_UNIFORM:
> +      case GL_COMPUTE_SUBROUTINE_UNIFORM:
> +      case GL_TESS_CONTROL_SUBROUTINE_UNIFORM:
> +      case GL_TESS_EVALUATION_SUBROUTINE_UNIFORM:
>        case GL_PROGRAM_INPUT:
>        case GL_PROGRAM_OUTPUT:
>           *val = program_resource_location(shProg, res,