Attachment 120401 Details for Bug 93266 – patch

[patch] patch

0001-glsl-Allow-binding-of-image-variables-with-420pack.patch (text/plain), 1.14 KB, created by Matt Turner on 2015-12-07 23:36:13 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Matt Turner

Created: 2015-12-07 23:36:13 UTC

Size: 1.14 KB

patch

obsolete

>From bec7ca3e2ff0af97f3c1d9ded5e2af8e6610063a Mon Sep 17 00:00:00 2001
>From: Matt Turner <mattst88@gmail.com>
>Date: Mon, 7 Dec 2015 11:14:56 -0800
>Subject: [PATCH] glsl: Allow binding of image variables with 420pack.
>
>This interaction was missed in the addition of ARB_image_load_store.
>
>Cc: "11.0 11.1" <mesa-stable@lists.freedesktop.org>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93266
>---
> src/glsl/ast_to_hir.cpp | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
>diff --git a/src/glsl/ast_to_hir.cpp b/src/glsl/ast_to_hir.cpp
>index 8fcda63..6d7e40f 100644
>--- a/src/glsl/ast_to_hir.cpp
>+++ b/src/glsl/ast_to_hir.cpp
>@@ -2649,7 +2649,9 @@ apply_explicit_binding(struct _mesa_glsl_parse_state *state,
> 
>          return;
>       }
>-   } else if (state->is_version(420, 310) && base_type->is_image()) {
>+   } else if ((state->is_version(420, 310) ||
>+               state->ARB_shading_language_420pack_enable) &&
>+              base_type->is_image()) {
>       assert(ctx->Const.MaxImageUnits <= MAX_IMAGE_UNITS);
>       if (max_index >= ctx->Const.MaxImageUnits) {
>          _mesa_glsl_error(loc, state, "Image binding %d exceeds the "
>-- 
>2.4.9
>

Actions: View | Splinter Review

Attachments on bug 93266: 120401

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.