From 36c93e96590b39362bb0159f5f55f1ad1db5e145 Mon Sep 17 00:00:00 2001 From: Iago Toral Quiroga Date: Fri, 16 Oct 2015 11:43:18 +0200 Subject: [PATCH] glsl_to_tgsi: Use {Num}UniformBlocks instead of {Num}BufferInterfaceBlocks MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The latter holds both UBOs and SSBOs, but here we only want UBOs. Reviewed-by: Kristian Høgsberg Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 06f510d..f481e89 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -5388,10 +5388,10 @@ st_translate_program( } if (program->shader) { - unsigned num_ubos = program->shader->NumBufferInterfaceBlocks; + unsigned num_ubos = program->shader->NumUniformBlocks; for (i = 0; i < num_ubos; i++) { - unsigned size = program->shader->BufferInterfaceBlocks[i].UniformBufferSize; + unsigned size = program->shader->UniformBlocks[i]->UniformBufferSize; unsigned num_const_vecs = (size + 15) / 16; unsigned first, last; assert(num_const_vecs > 0); -- 2.7.4