Mesa (master): glsl: Initialize variable in ir_swizzle:: constant_expression_value.

Vinson Lee vlee at kemper.freedesktop.org
Sun Aug 29 19:21:49 UTC 2010


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

Author: Vinson Lee <vlee at vmware.com>
Date:   Sun Aug 29 12:19:57 2010 -0700

glsl: Initialize variable in ir_swizzle::constant_expression_value.

Complete initialize data passed to ir_constant constructor.

Fixes piglit glsl-mat-from-int-ctor-02 valgrind unintialized variable
error with softpipe and llvmpipe.

---

 src/glsl/ir_constant_expression.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp
index 5ec60c5..458dca7 100644
--- a/src/glsl/ir_constant_expression.cpp
+++ b/src/glsl/ir_constant_expression.cpp
@@ -653,7 +653,7 @@ ir_swizzle::constant_expression_value()
    ir_constant *v = this->val->constant_expression_value();
 
    if (v != NULL) {
-      ir_constant_data data;
+      ir_constant_data data = { { 0 } };
 
       const unsigned swiz_idx[4] = {
 	 this->mask.x, this->mask.y, this->mask.z, this->mask.w




More information about the mesa-commit mailing list