Mesa (master): st/mesa: Use {Num}UniformBlocks instead of {Num}BufferInterfaceBlocks

[Iago Toral Quiroga]

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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Fri Oct 16 11:40:52 2015 +0200

st/mesa: 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 at bitplanet.net>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 src/mesa/state_tracker/st_atom_constbuf.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_atom_constbuf.c b/src/mesa/state_tracker/st_atom_constbuf.c
index 69e26cb..acaa85d 100644
--- a/src/mesa/state_tracker/st_atom_constbuf.c
+++ b/src/mesa/state_tracker/st_atom_constbuf.c
@@ -234,11 +234,11 @@ static void st_bind_ubos(struct st_context *st,
    if (!shader)
       return;
 
-   for (i = 0; i < shader->NumBufferInterfaceBlocks; i++) {
+   for (i = 0; i < shader->NumUniformBlocks; i++) {
       struct gl_uniform_buffer_binding *binding;
       struct st_buffer_object *st_obj;
 
-      binding = &st->ctx->UniformBufferBindings[shader->BufferInterfaceBlocks[i].Binding];
+      binding = &st->ctx->UniformBufferBindings[shader->UniformBlocks[i]->Binding];
       st_obj = st_buffer_object(binding->BufferObject);
 
       cb.buffer = st_obj->buffer;