From: Paul Berry <stereotype441@gmail.com>
Date: Sun, 29 Sep 2013 15:08:46 +0000 (-0700)
Subject: glsl: Fix block name of built-in gl_PerVertex interface block.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d2e66b953e458b591f86207d8b21253e1a9fbf08;p=mesa.git

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@whitecape.org>
Reviewed-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp
index 6fc9183ad14..6f93d96c691 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);