diff options
| author | Timothy Arceri <[email protected]> | 2015-07-25 12:33:53 +1000 |
|---|---|---|
| committer | Timothy Arceri <[email protected]> | 2015-07-30 22:00:45 +1000 |
| commit | 8cd2f88845acd45ebcbaae2e68a8a47b3c17e6d5 (patch) | |
| tree | 23d02a1c7f26b591a928974a797a3fd6e80cf132 /src/mesa/main/shaderapi.h | |
| parent | 3a21e4bd263002dd600e7a693536c93f68b285a5 (diff) | |
mesa: fix and simplify resource query for arrays
This removes the need for multiple functions designed to validate an array
subscript and replaces them with a call to a single function.
The change also means that validation is now only done once and the index
is retrived at the same time, as a result the getUniformLocation code can
be simplified saving an extra hash table lookup (and yet another
validation call).
This chage also fixes some tests in:
ES31-CTS.program_interface_query.uniform
V3: rebase on subroutines, and move the resource index array == 0
check into _mesa_GetProgramResourceIndex() to simplify things further
V2: Fix bounds checks for program input/output, split unrelated comment fix
and _mesa_get_uniform_location() removal into their own patch.
Cc: Tapani Pälli <[email protected]>
Reviewed-by: Tapani Pälli <[email protected]>
Diffstat (limited to 'src/mesa/main/shaderapi.h')
| -rw-r--r-- | src/mesa/main/shaderapi.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h index c081f749f93..0a10191684f 100644 --- a/src/mesa/main/shaderapi.h +++ b/src/mesa/main/shaderapi.h @@ -232,7 +232,8 @@ _mesa_program_resource_index(struct gl_shader_program *shProg, extern struct gl_program_resource * _mesa_program_resource_find_name(struct gl_shader_program *shProg, - GLenum programInterface, const char *name); + GLenum programInterface, const char *name, + unsigned *array_index); extern struct gl_program_resource * _mesa_program_resource_find_index(struct gl_shader_program *shProg, |