Attachment 115466 Details for Bug 90243 – patch to fix the issue

[patch] patch to fix the issue

0001-glsl-mark-special-built-in-inputs-referenced-by-vert.patch (text/plain), 1.99 KB, created by Tapani Pälli on 2015-04-30 05:34:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tapani Pälli

Created: 2015-04-30 05:34:30 UTC

Size: 1.99 KB

patch

obsolete

>From aa05c2d1652461c0f42495c39d5cc195a74b90dd Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Tapani=20P=C3=A4lli?= <tapani.palli@intel.com>
>Date: Thu, 30 Apr 2015 08:18:44 +0300
>Subject: [PATCH] glsl: mark special built-in inputs referenced by vertex stage
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Refactoring done on active attribute queries did not take in to
>account special built-in inputs for the vertex stage. This commit
>sets them referenced by vertex stage so that they get counted as
>active.
>
>Signed-off-by: Tapani PÃ¤lli <tapani.palli@intel.com>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=90243
>---
> src/glsl/linker.cpp | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
>diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>index 21fde94..6064f2f 100644
>--- a/src/glsl/linker.cpp
>+++ b/src/glsl/linker.cpp
>@@ -2556,6 +2556,7 @@ add_interface_variables(struct gl_shader_program *shProg,
> {
>    foreach_in_list(ir_instruction, node, sh->ir) {
>       ir_variable *var = node->as_variable();
>+      uint8_t mask = 0;
> 
>       if (!var)
>          continue;
>@@ -2571,6 +2572,10 @@ add_interface_variables(struct gl_shader_program *shProg,
>              var->data.location != SYSTEM_VALUE_VERTEX_ID_ZERO_BASE &&
>              var->data.location != SYSTEM_VALUE_INSTANCE_ID)
>             continue;
>+         /* Mark special built-in inputs referenced by the vertex stage so
>+          * that they are considered active by the shader queries.
>+          */
>+         mask = (1 << (MESA_SHADER_VERTEX));
>          /* FALLTHROUGH */
>       case ir_var_shader_in:
>          if (programInterface != GL_PROGRAM_INPUT)
>@@ -2585,7 +2590,7 @@ add_interface_variables(struct gl_shader_program *shProg,
>       };
> 
>       if (!add_program_resource(shProg, programInterface, var,
>-                                build_stageref(shProg, var->name)))
>+                                build_stageref(shProg, var->name) | mask))
>          return false;
>    }
>    return true;
>-- 
>2.1.0
>

Actions: View | Splinter Review

Attachments on bug 90243: 115466

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.