diff options
author | Tapani Pälli <tapani.palli@intel.com> | 2015-10-30 12:02:51 +0200 |
---|---|---|
committer | Tapani Pälli <tapani.palli@intel.com> | 2015-11-02 11:22:06 +0200 |
commit | efb333acb7ab4f9007cbeb0653783689101b0dd5 (patch) | |
tree | fbf1e32b9e49d1464420b3125d7d9f0eb53a8176 /src | |
parent | c2c124f89194fe33af522f090aa8e71f2c3aa474 (diff) | |
download | external_mesa3d-efb333acb7ab4f9007cbeb0653783689101b0dd5.zip external_mesa3d-efb333acb7ab4f9007cbeb0653783689101b0dd5.tar.gz external_mesa3d-efb333acb7ab4f9007cbeb0653783689101b0dd5.tar.bz2 |
mesa: fix program resource queries for atomic counter buffers
gl_active_atomic_buffer contains index to UniformStorage, we need to
calculate resource index for that gl_uniform_storage.
Fixes following CTS tests:
ES31-CTS.program_interface_query.atomic-counters
ES31-CTS.program_interface_query.atomic-counters-one-buffer
No Piglit regressions.
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mesa/main/shader_query.cpp | 28 |
1 files changed, 26 insertions, 2 deletions
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index fc0276f..dd51bba 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -669,6 +669,20 @@ _mesa_program_resource_index(struct gl_shader_program *shProg, } } +/** + * Find a program resource that points to given data. + */ +static struct gl_program_resource* +program_resource_find_data(struct gl_shader_program *shProg, void *data) +{ + struct gl_program_resource *res = shProg->ProgramResourceList; + for (unsigned i = 0; i < shProg->NumProgramResourceList; i++, res++) { + if (res->Data == data) + return res; + } + return NULL; +} + /* Find a program resource with specific index in given interface. */ struct gl_program_resource * @@ -1066,8 +1080,18 @@ get_buffer_property(struct gl_shader_program *shProg, *val = RESOURCE_ATC(res)->NumUniforms; return 1; case GL_ACTIVE_VARIABLES: - for (unsigned i = 0; i < RESOURCE_ATC(res)->NumUniforms; i++) - *val++ = RESOURCE_ATC(res)->Uniforms[i]; + for (unsigned i = 0; i < RESOURCE_ATC(res)->NumUniforms; i++) { + /* Active atomic buffer contains index to UniformStorage. Find + * out gl_program_resource via data pointer and then calculate + * index of that uniform. + */ + unsigned idx = RESOURCE_ATC(res)->Uniforms[i]; + struct gl_program_resource *uni = + program_resource_find_data(shProg, + &shProg->UniformStorage[idx]); + assert(uni); + *val++ = _mesa_program_resource_index(shProg, uni); + } return RESOURCE_ATC(res)->NumUniforms; } } |