Mesa (8.0): glsl: initialise const force glsl extension warning in fake ctx

Andreas Boll ab at kemper.freedesktop.org
Thu Nov 29 10:44:32 UTC 2012


Module: Mesa
Branch: 8.0
Commit: db8cb2250335a93cad6e877e634116e5cd6b42fc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=db8cb2250335a93cad6e877e634116e5cd6b42fc

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Mar 13 14:53:25 2012 +0000

glsl: initialise const force glsl extension warning in fake ctx

valgrind complained about an uninitialised value being used in
glsl_parser_extras.cpp, and this was the one it was giving out about.

Just initialise the value in the fakectx.

Signed-off-by: Dave Airlie <airlied at redhat.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=48057
(cherry picked from commit b78a77f979b21a84aecb6fa4f19a2ed51a48c306)

---

 src/glsl/builtins/tools/generate_builtins.py |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index 72d12bb..bd15c4d 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -156,6 +156,7 @@ read_builtins(GLenum target, const char *protos, const char **functions, unsigne
    fakeCtx.API = API_OPENGL;
    fakeCtx.Const.GLSLVersion = 130;
    fakeCtx.Extensions.ARB_ES2_compatibility = true;
+   fakeCtx.Const.ForceGLSLExtensionsWarn = false;
    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
    struct _mesa_glsl_parse_state *st =
       new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);




More information about the mesa-commit mailing list