From 12f3b3d43732b6f9dbed72457a75b131ad621793 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Mon, 17 Dec 2012 11:20:53 -0800 Subject: [PATCH] glsl: Fix gl_context vs. ralloc context in check_version again, again. Dave found some, but there were more. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=58039 --- src/glsl/glsl_parser_extras.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index 91122cc605f..b460c86192d 100644 --- a/src/glsl/glsl_parser_extras.cpp +++ b/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)", -- 2.11.0