Mesa (master): glsl: Fix block name of built-in gl_PerVertex interface block.

Paul Berry stereotype441 at kemper.freedesktop.org
Thu Oct 10 21:46:57 UTC 2013


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

Author: Paul Berry <stereotype441 at gmail.com>
Date:   Sun Sep 29 08:08:46 2013 -0700

glsl: Fix block name of built-in gl_PerVertex interface block.

Previously, we erroneously used the name "gl_in" for both the block
name and the instance name.

Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>

---

 src/glsl/builtin_variables.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 6fc9183..6f93d96 100644
--- a/src/glsl/builtin_variables.cpp
+++ b/src/glsl/builtin_variables.cpp
@@ -828,7 +828,7 @@ builtin_variable_generator::generate_varyings()
          glsl_type::get_interface_instance(this->per_vertex_fields,
                                            this->num_per_vertex_fields,
                                            GLSL_INTERFACE_PACKING_STD140,
-                                           "gl_in");
+                                           "gl_PerVertex");
       ir_variable *var = add_variable("gl_in", array(per_vertex_type, 0),
                                       ir_var_shader_in, -1);
       var->init_interface_type(per_vertex_type);




More information about the mesa-commit mailing list