Attachment 71572 Details for Bug 58039 – attempted fix.

[patch] attempted fix.

0001-glsl_parser_extras.cpp-fixup-gl-vs-mem-contexts-agai.patch (text/plain), 2.05 KB, created by Dave Airlie on 2012-12-16 01:48:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dave Airlie

Created: 2012-12-16 01:48:18 UTC

Size: 2.05 KB

patch

obsolete

>From 0caec355593eea6c1780faccb74ac7d5b02ce687 Mon Sep 17 00:00:00 2001
>From: Dave Airlie <airlied@gmail.com>
>Date: Sun, 16 Dec 2012 11:47:01 +1000
>Subject: [PATCH] glsl_parser_extras.cpp: fixup gl vs mem contexts again.
>
>This should fix:
>https://bugs.freedesktop.org/show_bug.cgi?id=58039
>
>Signed-off-by: Dave Airlie <airlied@redhat.com>
>---
> src/glsl/glsl_parser_extras.cpp | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
>diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
>index d360892..91122cc 100644
>--- a/src/glsl/glsl_parser_extras.cpp
>+++ b/src/glsl/glsl_parser_extras.cpp
>@@ -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.",
>-- 
>1.8.0.2
>

Actions: View | Splinter Review

Attachments on bug 58039: 71572

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.