From: Ian Romanick <ian.d.romanick@intel.com>
Date: Wed, 8 Sep 2010 18:33:12 +0000 (-0700)
Subject: glsl2: Make sure _mesa_glsl_parse_state constructor gets a context
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=961f42c9bd795204e031ea6a31a2ae04ba2e4067;p=mesa.git

glsl2: Make sure _mesa_glsl_parse_state constructor gets a context

Fix an major regression in dc754586.  Too bad that change was
obviously never tested.
---

diff --git a/src/glsl/builtin_function.cpp b/src/glsl/builtin_function.cpp
index 4a319ef999a..d96c15cb30f 100644
--- a/src/glsl/builtin_function.cpp
+++ b/src/glsl/builtin_function.cpp
@@ -35,9 +35,10 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
 gl_shader *
 read_builtins(GLenum target, const char *protos, const char **functions, unsigned count)
 {
+   GLcontext fakeCtx;
    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
    struct _mesa_glsl_parse_state *st =
-      new(sh) _mesa_glsl_parse_state(NULL, target, sh);
+      new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
 
    st->language_version = 130;
    st->symbols->language_version = 130;
diff --git a/src/glsl/builtins/tools/generate_builtins.py b/src/glsl/builtins/tools/generate_builtins.py
index bc64b4b3b5c..2431096a2b5 100755
--- a/src/glsl/builtins/tools/generate_builtins.py
+++ b/src/glsl/builtins/tools/generate_builtins.py
@@ -128,9 +128,10 @@ _mesa_new_shader(GLcontext *ctx, GLuint name, GLenum type);
 gl_shader *
 read_builtins(GLenum target, const char *protos, const char **functions, unsigned count)
 {
+   GLcontext fakeCtx;
    gl_shader *sh = _mesa_new_shader(NULL, 0, target);
    struct _mesa_glsl_parse_state *st =
-      new(sh) _mesa_glsl_parse_state(NULL, target, sh);
+      new(sh) _mesa_glsl_parse_state(&fakeCtx, target, sh);
 
    st->language_version = 130;
    st->symbols->language_version = 130;