Mesa (master): st_glsl_to_tgsi: init index to 0 before get_deref_offsets()

Michel Dänzer daenzer at kemper.freedesktop.org
Tue Jun 13 09:14:05 UTC 2017


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

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jun 13 10:03:52 2017 +0200

st_glsl_to_tgsi: init index to 0 before get_deref_offsets()

Fixes: 8ec4975cd83 ("st_glsl_to_tgsi: don't try and pass 32-bit values to get_deref_offsets")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=101401
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-and-Tested-by: Michel Dänzer <michel.daenzer at 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 798831613f..66f0814ddc 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -3776,7 +3776,7 @@ glsl_to_tgsi_visitor::visit_image_intrinsic(ir_call *ir)
 
    st_src_reg reladdr;
    st_src_reg image(PROGRAM_IMAGE, 0, GLSL_TYPE_UINT);
-   uint16_t index;
+   uint16_t index = 0;
    get_deref_offsets(img, &sampler_array_size, &sampler_base,
                      &index, &reladdr, true);
 
@@ -4392,7 +4392,7 @@ glsl_to_tgsi_visitor::visit(ir_texture *ir)
 
    st_src_reg sampler(PROGRAM_SAMPLER, 0, GLSL_TYPE_UINT);
 
-   uint16_t index;
+   uint16_t index = 0;
    get_deref_offsets(ir->sampler, &sampler_array_size, &sampler_base,
                      &index, &reladdr, true);
 




More information about the mesa-commit mailing list