Attachment 115293 Details for Bug 90149 – fix

[patch] fix

0001-mesa-fix-glGetActiveUniformsiv-regression.patch (text/plain), 2.28 KB, created by Tapani Pälli on 2015-04-23 11:20:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tapani Pälli

Created: 2015-04-23 11:20:58 UTC

Size: 2.28 KB

patch

obsolete

>From 11ecfe00139ea234d40b14e12b703cf83f321ca9 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
>Date: Thu, 23 Apr 2015 11:25:36 +0300
>Subject: [PATCH] mesa: fix glGetActiveUniformsiv regression
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Commit 7519ddb caused regression to glGetActiveUniformsiv.
>Patch adds back validation loop of all given uniforms before
>writing any values, not touching params in case of errors
>is tested by the conformance suite.
>
>Signed-off-by: Tapani PÃ¤lli <tapani.palli@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90149
>---
> src/mesa/main/uniform_query.cpp | 20 ++++++++++++++++----
> 1 file changed, 16 insertions(+), 4 deletions(-)
>
>diff --git a/src/mesa/main/uniform_query.cpp b/src/mesa/main/uniform_query.cpp
>index 4e77b32..3e857ed 100644
>--- a/src/mesa/main/uniform_query.cpp
>+++ b/src/mesa/main/uniform_query.cpp
>@@ -129,14 +129,26 @@ _mesa_GetActiveUniformsiv(GLuint program,
> 
>    res_prop = resource_prop_from_uniform_prop(pname);
> 
>+   /* We need to first verify that each entry exists as active uniform. If
>+    * not, generate error and do not cause any other side effects.
>+    *
>+    * In the case of and error condition, Page 16 (section 2.3.1 Errors)
>+    * of the OpenGL 4.5 spec says:
>+    *
>+    *     "If the generating command modifies values through a pointer argu-
>+    *     ment, no change is made to these values."
>+    */
>    for (int i = 0; i < uniformCount; i++) {
>-      res = _mesa_program_resource_find_index(shProg, GL_UNIFORM,
>-                                              uniformIndices[i]);
>-      if (!res) {
>+      if (!_mesa_program_resource_find_index(shProg, GL_UNIFORM,
>+                                              uniformIndices[i])) {
>          _mesa_error(ctx, GL_INVALID_VALUE, "glGetActiveUniformsiv(index)");
>-         break;
>+         return;
>       }
>+   }
> 
>+   for (int i = 0; i < uniformCount; i++) {
>+      res = _mesa_program_resource_find_index(shProg, GL_UNIFORM,
>+                                              uniformIndices[i]);
>       if (!_mesa_program_resource_prop(shProg, res, uniformIndices[i],
>                                        res_prop, &params[i],
>                                        "glGetActiveUniformsiv"))
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 90149: 115287 | 115293

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.