From: Iago Toral Quiroga <itoral@igalia.com>
Date: Fri, 16 Oct 2015 09:43:18 +0000 (+0200)
Subject: glsl_to_tgsi: Use {Num}UniformBlocks instead of {Num}BufferInterfaceBlocks
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=36c93e96590b39362bb0159f5f55f1ad1db5e145;p=mesa.git

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 <krh@bitplanet.net>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
---

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 06f510db536..f481e8902d8 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);