diff options
| author | Brian Paul <[email protected]> | 2016-11-05 11:00:10 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2016-11-05 12:09:40 -0600 |
| commit | cfb5a9ab2321ae82c28655cee0537f1d42c57933 (patch) | |
| tree | 5d67b5498c18fd6c65f27dce3723d4e7a95f44b7 | |
| parent | 0148313ea36385edcd869a899b8aa5b82d194164 (diff) | |
st/mesa: initialize members of glsl_to_tgsi_instruction in emit_asm()
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 <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 882e959655e..a4679e53b8d 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): */ |