Module: Mesa
Branch: glsl2
Commit: c64da87611823b4b53e93188f861f748a69936a3
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=c64da87611823b4b53e93188f861f748a69936a3

Author: Eric Anholt <[email protected]>
Date:   Wed Jun 30 14:01:43 2010 -0700

ir_to_mesa: Fix the indexing of attributes in the program's Attributes.

This fixes GetAttribLocation returning VERT_ATTRIB_GENERIC1 instead of 1,
caught by glsl-dlist-getattriblocation.

---

 src/mesa/shader/ir_to_mesa.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/shader/ir_to_mesa.cpp b/src/mesa/shader/ir_to_mesa.cpp
index 4eac810..c39621b 100644
--- a/src/mesa/shader/ir_to_mesa.cpp
+++ b/src/mesa/shader/ir_to_mesa.cpp
@@ -1008,7 +1008,7 @@ ir_to_mesa_visitor::visit(ir_dereference_variable *ir)
                                   ir->var->name,
                                   type_size(ir->var->type) * 4,
                                   ir->var->type->gl_type,
-                                  ir->var->location);
+                                  ir->var->location - VERT_ATTRIB_GENERIC0);
            }
         } else {
            entry = new(mem_ctx) temp_entry(ir->var,

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to