From cfb5a9ab2321ae82c28655cee0537f1d42c57933 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 5 Nov 2016 11:00:10 -0600 Subject: [PATCH] st/mesa: initialize members of glsl_to_tgsi_instruction in emit_asm() MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This fixes random crashes with MSVC release builds. It seems the members are implicitly initialized to zero with gcc, but not MSVC. In particular, the tex_offset_num_offset field was non-zero causing a loop over the NULL tex_offsets array to crash. Zero-init those fields and a few others to be safe. The regression began with acc23b04cfd64e "ralloc: remove memset from ralloc_size". Reviewed-by: Marek Olšák --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 882e959..a4679e5 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -680,6 +680,10 @@ glsl_to_tgsi_visitor::emit_asm(ir_instruction *ir, unsigned op, inst->is_64bit_expanded = false; inst->ir = ir; inst->dead_mask = 0; + inst->tex_offsets = NULL; + inst->tex_offset_num_offset = 0; + inst->saturate = 0; + inst->tex_shadow = 0; /* default to float, for paths where this is not initialized * (since 0==UINT which is likely wrong): */ -- 2.7.4