Attachment 106707 Details for Bug 84225 – Fix

Fix

0001-Allow-any-sort-of-sampler-array-indexing-with-GLSL-E.patch (text/plain), 1.13 KB, created by kalyank on 2014-09-23 06:55:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: kalyank

Created: 2014-09-23 06:55:59 UTC

Size: 1.13 KB

patch

obsolete

>From 14d2dd7fdd76677ca0b9d1a22cbfd807cc59b292 Mon Sep 17 00:00:00 2001
>From: Kalyan Kondapally <kalyan.kondapally@intel.com>
>Date: Sun, 21 Sep 2014 17:18:14 -0700
>Subject: [PATCH] Allow any sort of sampler array indexing with GLSL-ES < 300
>
>Restrictions were added in GLSL 1.30 to allow indexing of arrays with
>integral constants only. Earlier versions (GLSL <= 1.20 and GLSL-ES <=100)
>should allow any sort of sampler array indexing.
>
>Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>
>---
> src/glsl/ast_array_index.cpp | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/src/glsl/ast_array_index.cpp b/src/glsl/ast_array_index.cpp
>index 5ca85f6..167ed9e 100644
>--- a/src/glsl/ast_array_index.cpp
>+++ b/src/glsl/ast_array_index.cpp
>@@ -222,7 +222,7 @@ _mesa_ast_array_index_to_hir(void *mem_ctx,
>        * dynamically uniform expression is undefined.
>        */
>       if (array->type->element_type()->is_sampler()) {
>-	 if (!state->is_version(130, 100)) {
>+	 if (state->is_version(120, 100)) {
> 	    if (state->es_shader) {
> 	       _mesa_glsl_warning(&loc, state,
> 				  "sampler arrays indexed with non-constant "
>-- 
>1.9.1
>

Actions: View

Attachments on bug 84225: 106707 | 114800

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.