aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/glsl
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-12-18 10:03:13 +0100
committermarha <marha@users.sourceforge.net>2012-12-18 10:03:13 +0100
commit293fd0043af7e861c9c540bebc44630d0da0bf9b (patch)
treea2579cb27e39607896c76419af5a1ba2f5964ec9 /mesalib/src/glsl
parent840c8745518b92303d40f6834e9c616587242231 (diff)
downloadvcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.tar.gz
vcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.tar.bz2
vcxsrv-293fd0043af7e861c9c540bebc44630d0da0bf9b.zip
xserver mesa git update 18 oct 2012
xserver: 3420a7778c7d5eaa638327f31dd460554c257bb1 mesa: dc613f11ddf1f3a6e10c2d99830fb1a84fdb55b2
Diffstat (limited to 'mesalib/src/glsl')
-rw-r--r--mesalib/src/glsl/glsl_parser_extras.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glsl_parser_extras.cpp b/mesalib/src/glsl/glsl_parser_extras.cpp
index 91122cc60..b460c8619 100644
--- a/mesalib/src/glsl/glsl_parser_extras.cpp
+++ b/mesalib/src/glsl/glsl_parser_extras.cpp
@@ -154,9 +154,9 @@ _mesa_glsl_parse_state::check_version(unsigned required_glsl_version,
char *problem = ralloc_vasprintf(this, fmt, args);
va_end(args);
const char *glsl_version_string
- = glsl_compute_version_string(ctx, false, required_glsl_version);
+ = glsl_compute_version_string(this, false, required_glsl_version);
const char *glsl_es_version_string
- = glsl_compute_version_string(ctx, true, required_glsl_es_version);
+ = glsl_compute_version_string(this, true, required_glsl_es_version);
const char *requirement_string = "";
if (required_glsl_version && required_glsl_es_version) {
requirement_string = ralloc_asprintf(this, " (%s or %s required)",