Mesa (master): st/mesa: don't ignore const buf index in src_register()

Brian Paul brianp at kemper.freedesktop.org
Tue Jul 1 15:43:49 UTC 2014


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

Author: Brian Paul <brianp at vmware.com>
Date:   Tue Jul  1 07:53:16 2014 -0600

st/mesa: don't ignore const buf index in src_register()

Otherwise, if we were creating a const buffer src register for a UBO
the index into the UBO was always zero.

Reviewed-by: Roland Scheidegger <sroland at vmware.com>

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 13de2be..256f356 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -4400,7 +4400,7 @@ src_register(struct st_translate *t,
    case PROGRAM_CONSTANT:       /* ie, immediate */
       if (index2D) {
          struct ureg_src src;
-         src = ureg_src_register(TGSI_FILE_CONSTANT, 0);
+         src = ureg_src_register(TGSI_FILE_CONSTANT, index);
          src.Dimension = 1;
          src.DimensionIndex = index2D;
          return src;




More information about the mesa-commit mailing list