Mesa (master): glsl_to_tgsi: Use {Num}UniformBlocks instead of {Num}BufferInterfaceBlocks

[Iago Toral Quiroga]

Module: Mesa
Branch: master
Commit: 36c93e96590b39362bb0159f5f55f1ad1db5e145
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=36c93e96590b39362bb0159f5f55f1ad1db5e145

Author: Iago Toral Quiroga <ito...@igalia.com>
Date:   Fri Oct 16 11:43:18 2015 +0200

glsl_to_tgsi: Use {Num}UniformBlocks instead of {Num}BufferInterfaceBlocks

The latter holds both UBOs and SSBOs, but here we only want UBOs.

Reviewed-by: Kristian Høgsberg <k...@bitplanet.net>
Reviewed-by: Marek Olšák <marek.ol...@amd.com>

---

 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);

_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit