Attachment 73482 Details for Bug 59688 – fix

[patch] fix

patch (text/plain), 1.07 KB, created by fjhenigman on 2013-01-22 21:53:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: fjhenigman

Created: 2013-01-22 21:53:05 UTC

Size: 1.07 KB

patch

obsolete

>diff --git a/tests/shaders/glsl-uniform-out-of-bounds-2.c b/tests/shaders/glsl-uniform-out-of-bounds-2.c
>index db46a1e..32ac693 100644
>--- a/tests/shaders/glsl-uniform-out-of-bounds-2.c
>+++ b/tests/shaders/glsl-uniform-out-of-bounds-2.c
>@@ -83,17 +83,18 @@ piglit_init(int argc, char **argv)
> 		glGetActiveUniform(prog, k, ARRAY_SIZE(name), NULL,
> 				   &num_active_elements,
> 				   &type, name);
>-		if (!((name[0] == 'v' || name[0] == 'm') && name[1] == 0))
>+		if (!((name[0] == 'v' || name[0] == 'm')
>+			    && (name[1] == 0 || name[1] == '[')))
> 			continue;
>-		printf("array '%s' active elements %d\n",
>-		       name, num_active_elements);
>+		printf("array '%c' active elements %d\n",
>+		       name[0], num_active_elements);
> 
> 		/* for each index in array, plus some before and after */
> 		for (i = -2; i < 6; ++i) {
> 			bool is_active = 0 <= i && i < num_active_elements;
> 			GLchar element[9];
> 			GLint loc;
>-			sprintf(element, "%s[%d]", name, i);
>+			sprintf(element, "%c[%d]", name[0], i);
> 			loc = glGetUniformLocation(prog, element);
> 
> 			/* does glGetUniformLocation agree with

Actions: View | Splinter Review

Attachments on bug 59688: 73482

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.