Attachment 37850 Details for Bug 29540 – Assign attrib location 0 if gl_Vertex is not used

[patch] Assign attrib location 0 if gl_Vertex is not used

0001-linker-Assign-attrib-location-0-if-gl_Vertex-is-not-.patch (text/plain), 1.97 KB, created by Ian Romanick on 2010-08-13 12:38:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ian Romanick

Created: 2010-08-13 12:38:26 UTC

Size: 1.97 KB

patch

obsolete

>From da1d1b7cf09aae7b8649fc26c937f04033ae1b5f Mon Sep 17 00:00:00 2001
>From: Ian Romanick <ian.d.romanick@intel.com>
>Date: Fri, 13 Aug 2010 12:30:41 -0700
>Subject: [PATCH] linker: Assign attrib location 0 if gl_Vertex is not used
>
>If gl_Vertex is not used in the shader, then attribute location 0 is
>available for use.
>
>Fixes piglit test case glsl-getattriblocation (bugzilla #29540).
>---
> src/glsl/linker.cpp |   37 ++++++++++++++++++++++++++++++++++++-
> 1 files changed, 36 insertions(+), 1 deletions(-)
>
>diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
>index c462d31..b9069d0 100644
>--- a/src/glsl/linker.cpp
>+++ b/src/glsl/linker.cpp
>@@ -116,6 +116,38 @@ private:
> };
> 
> 
>+/**
>+ * Visitor that determines whether or not a variable is ever read.
>+ */
>+class find_deref_visitor : public ir_hierarchical_visitor {
>+public:
>+   find_deref_visitor(const char *name)
>+      : name(name), found(false)
>+   {
>+      /* empty */
>+   }
>+
>+   virtual ir_visitor_status visit(ir_dereference_variable *ir)
>+   {
>+      if (strcmp(name, ir->var->name) == 0) {
>+	 found = true;
>+	 return visit_stop;
>+      }
>+
>+      return visit_continue_with_parent;
>+   }
>+
>+   bool variable_found()
>+   {
>+      return found;
>+   }
>+
>+private:
>+   const char *name;       /**< Find writes to a variable with this name. */
>+   bool found;             /**< Was a write to the variable found? */
>+};
>+
>+
> void
> linker_error_printf(gl_shader_program *prog, const char *fmt, ...)
> {
>@@ -1042,7 +1074,10 @@ assign_attribute_locations(gl_shader_program *prog, unsigned max_attribute_index
>     * be explicitly assigned by via glBindAttribLocation.  Mark it as reserved
>     * to prevent it from being automatically allocated below.
>     */
>-   used_locations |= (1 << 0);
>+   find_deref_visitor find("gl_Vertex");
>+   find.run(sh->ir);
>+   if (find.variable_found())
>+      used_locations |= (1 << 0);
> 
>    for (unsigned i = 0; i < num_attr; i++) {
>       /* Mask representing the contiguous slots that will be used by this
>-- 
>1.7.0.4
>

Actions: View | Splinter Review

Attachments on bug 29540: 37848 | 37850

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.