Mesa (master): glsl: Fix gl_context vs. ralloc context in check_version again, again.
Kenneth Graunke
kwg at kemper.freedesktop.org
Mon Dec 17 19:25:04 UTC 2012
Module: Mesa
Branch: master
Commit: 12f3b3d43732b6f9dbed72457a75b131ad621793
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=12f3b3d43732b6f9dbed72457a75b131ad621793
Author: Kenneth Graunke <kenneth at whitecape.org>
Date: Mon Dec 17 11:20:53 2012 -0800
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 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index 91122cc..b460c86 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)",
More information about the mesa-commit
mailing list