From 74553240301c60e3520fb55e09391993dac28f5d Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Tue, 29 Sep 2015 13:34:20 +0200 Subject: [PATCH] main: Fix block index when mixing UBO and SSBO blocks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Since we store both in UniformBlocks, we can't just compute the index by subtracting the array address start, we need to count the number of buffers of the approriate type. v2: - Just fall back to calc_resource_index (Tapani) Reviewed-by: Tapani Pälli --- src/mesa/main/shader_query.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 73dee85cc4d..718967605b5 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -611,11 +611,10 @@ _mesa_program_resource_index(struct gl_shader_program *shProg, return GL_INVALID_INDEX; switch (res->Type) { - case GL_UNIFORM_BLOCK: - case GL_SHADER_STORAGE_BLOCK: - return RESOURCE_UBO(res)- shProg->UniformBlocks; case GL_ATOMIC_COUNTER_BUFFER: return RESOURCE_ATC(res) - shProg->AtomicBuffers; + case GL_UNIFORM_BLOCK: + case GL_SHADER_STORAGE_BLOCK: case GL_TRANSFORM_FEEDBACK_VARYING: default: return calc_resource_index(shProg, res); -- 2.30.2