Attachment 115737 Details for Bug 90397 – patch to GetProgramResourceIndex() to fix arrays of UBOs behavior

[patch] patch to GetProgramResourceIndex() to fix arrays of UBOs behavior

0001-mesa-main-validate-name-syntax-for-array-variables-o.patch (text/plain), 1.54 KB, created by Samuel Iglesias Gonsálvez on 2015-05-13 10:41:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Samuel Iglesias Gonsálvez

Created: 2015-05-13 10:41:47 UTC

Size: 1.54 KB

patch

obsolete

>From 6adc65ef04febb48b08f671c735de26b5f07e506 Mon Sep 17 00:00:00 2001
>From: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
>Date: Wed, 13 May 2015 12:18:31 +0200
>Subject: [PATCH] mesa/main: validate name syntax for array variables only
>
>From ARB_program_interface_query:
>
> "Note that if an interface enumerates a single active resource list
> entry for an array variable (e.g., "a[0]"), a <name> identifying
> any array element other than the first (e.g., "a[1]") is not
> considered to match."
>
>It doesn't apply to arrays of interface blocks because their names can
>be get by glGetProgramResourceName().
>
>Signed-off-by: Samuel Iglesias Gonsalvez <siglesias@igalia.com>
>---
> src/mesa/main/program_resource.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/mesa/main/program_resource.c b/src/mesa/main/program_resource.c
>index b15a132..d857b84 100644
>--- a/src/mesa/main/program_resource.c
>+++ b/src/mesa/main/program_resource.c
>@@ -220,12 +220,12 @@ _mesa_GetProgramResourceIndex(GLuint program, GLenum programInterface,
>    case GL_PROGRAM_INPUT:
>    case GL_PROGRAM_OUTPUT:
>    case GL_UNIFORM:
>-   case GL_UNIFORM_BLOCK:
>    case GL_TRANSFORM_FEEDBACK_VARYING:
>-      /* Validate name syntax for arrays. */
>+      /* Validate name syntax for array variables */
>       if (!valid_program_resource_index_name(name))
>          return GL_INVALID_INDEX;
>-
>+      /* fall-through */
>+   case GL_UNIFORM_BLOCK:
>       res = _mesa_program_resource_find_name(shProg, programInterface, name);
>       if (!res)
>          return GL_INVALID_INDEX;
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 90397: 115690 | 115737

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.