mesa: add additional checks for uniform location query

Patch adds additional check to make sure we don't return locations for
structures or arrays of structures.

From page 79 of the OpenGL 4.2 spec:
    "A valid name cannot be a structure, an array of structures, or any
    portion of a single vector or a matrix."

v2: use without-array() to simplify code (Timothy)

No Piglit or CTS regressions observed.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
This commit is contained in:
Tapani Pälli
2015-10-26 11:13:14 +02:00
parent a305d59baa
commit 8ae4317c36

View File

@@ -808,6 +808,14 @@ program_resource_location(struct gl_shader_program *shProg,
if (RESOURCE_UNI(res)->builtin)
return -1;
/* From page 79 of the OpenGL 4.2 spec:
*
* "A valid name cannot be a structure, an array of structures, or any
* portion of a single vector or a matrix."
*/
if (RESOURCE_UNI(res)->type->without_array()->is_record())
return -1;
/* From the GL_ARB_uniform_buffer_object spec:
*
* "The value -1 will be returned if <name> does not correspond to an