fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-01 18:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

glsl_parser_extras.cpp: fixup gl vs mem contexts again.

Browse source 
This should fix:
https://bugs.freedesktop.org/show_bug.cgi?id=58039

Tested-by: Darxus on bug 58039
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2012-12-16 11:47:01 +10:00
parent 4f91f8dd60
commit a9abaaafd8
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/glsl/glsl_parser_extras.cpp
View file

@ -151,7 +151,7 @@ _mesa_glsl_parse_state::check_version(unsigned required_glsl_version,
va_list args;
va_start(args, fmt);
char *problem = ralloc_vasprintf(ctx, fmt, args);
char *problem = ralloc_vasprintf(this, fmt, args);
va_end(args);
const char *glsl_version_string
= glsl_compute_version_string(ctx, false, required_glsl_version);
@ -159,14 +159,14 @@ _mesa_glsl_parse_state::check_version(unsigned required_glsl_version,
= glsl_compute_version_string(ctx, true, required_glsl_es_version);
const char *requirement_string = "";
if (required_glsl_version && required_glsl_es_version) {
requirement_string = ralloc_asprintf(ctx, " (%s or %s required)",
requirement_string = ralloc_asprintf(this, " (%s or %s required)",
glsl_version_string,
glsl_es_version_string);
} else if (required_glsl_version) {
requirement_string = ralloc_asprintf(ctx, " (%s required)",
requirement_string = ralloc_asprintf(this, " (%s required)",
glsl_version_string);
} else if (required_glsl_es_version) {
requirement_string = ralloc_asprintf(ctx, " (%s required)",
requirement_string = ralloc_asprintf(this, " (%s required)",
glsl_es_version_string);
}
_mesa_glsl_error(locp, this, "%s in %s%s.",