Mesa (glsl-to-tgsi): st/mesa: fix compile error with g++ 4. 6 in st_glsl_to_tgsi

Dave Airlie airlied at kemper.freedesktop.org
Fri Jun 17 22:10:19 UTC 2011


Module: Mesa
Branch: glsl-to-tgsi
Commit: 111d90d0ab0f48ca438782ede7f0d30aac04babf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=111d90d0ab0f48ca438782ede7f0d30aac04babf

Author: Bryan Cain <bryancain3 at gmail.com>
Date:   Thu Jun 16 13:42:57 2011 -0500

st/mesa: fix compile error with g++ 4.6 in st_glsl_to_tgsi

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 5fedf26..6c92441 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -389,7 +389,7 @@ public:
    void *mem_ctx;
 };
 
-static st_src_reg undef_src = st_src_reg(PROGRAM_UNDEFINED, 0, NULL);
+static st_src_reg undef_src = st_src_reg(PROGRAM_UNDEFINED, 0, GLSL_TYPE_ERROR);
 
 static st_dst_reg undef_dst = st_dst_reg(PROGRAM_UNDEFINED, SWIZZLE_NOOP, GLSL_TYPE_ERROR);
 




More information about the mesa-commit mailing list