From: Tapani Pälli <tapani.palli@intel.com>
Date: Mon, 11 May 2015 10:24:20 +0000 (+0300)
Subject: glsl: add stage references for UBO uniforms
X-Git-Tag: android-x86-6.0-r1~9939
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=9f4eaba36f002f4ea86bc11fd3d0f8dce485b9d8;p=android-x86%2Fexternal-mesa.git

glsl: add stage references for UBO uniforms

Patch marks uniforms inside UBO properly referenced by stages.

Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90397
---

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index ea73c6f9da1..ecdc025710f 100644
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -2700,6 +2700,16 @@ build_program_resource_list(struct gl_context *ctx,
 
       uint8_t stageref =
          build_stageref(shProg, shProg->UniformStorage[i].name);
+
+      /* Add stagereferences for uniforms in a uniform block. */
+      int block_index = shProg->UniformStorage[i].block_index;
+      if (block_index != -1) {
+         for (unsigned j = 0; j < MESA_SHADER_STAGES; j++) {
+             if (shProg->UniformBlockStageIndex[j][block_index] != -1)
+                stageref |= (1 << j);
+         }
+      }
+
       if (!add_program_resource(shProg, GL_UNIFORM,
                                 &shProg->UniformStorage[i], stageref))
          return;