<div dir="ltr">On 5 October 2013 12:10, Kenneth Graunke <span dir="ltr"><<a href="mailto:kenneth@whitecape.org" target="_blank">kenneth@whitecape.org</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div class="HOEnZb"><div class="h5">On 10/02/2013 05:45 PM, Paul Berry wrote:<br>
> Previously, we erroneously used the name "gl_in" for both the block<br>
> name and the instance name.<br>
> ---<br>
>  src/glsl/builtin_variables.cpp | 2 +-<br>
>  1 file changed, 1 insertion(+), 1 deletion(-)<br>
><br>
> diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp<br>
> index 3667dc8..91518ba 100644<br>
> --- a/src/glsl/builtin_variables.cpp<br>
> +++ b/src/glsl/builtin_variables.cpp<br>
> @@ -827,7 +827,7 @@ builtin_variable_generator::generate_varyings()<br>
>           glsl_type::get_interface_instance(this->per_vertex_fields,<br>
>                                             this->num_per_vertex_fields,<br>
>                                             GLSL_INTERFACE_PACKING_STD140,<br>
> -                                           "gl_in");<br>
> +                                           "gl_PerVertex");<br>
>        ir_variable *var = add_variable("gl_in", array(per_vertex_type, 0),<br>
>                                        ir_var_shader_in, -1);<br>
>        var->init_interface_type(per_vertex_type);<br>
<br>
</div></div>It would be fantastic if you could update the prototype in glsl_types.h to<br>
say "block_name" instead of "name" for the parameter:<br>
<br>
   /**<br>
    * Get the instance of an interface block type<br>
    */<br>
   static const glsl_type *get_interface_instance(const glsl_struct_field *fields,<br>
                                                  unsigned num_fields,<br>
                                                  enum glsl_interface_packing packing,<br>
                                                  const char *name);<br>
<br>
With just "name", it's not obvious which is supposed to be passed here.<br></blockquote><div><br></div><div>Sure.  That's easily separable from this series so I'll do it in an independent patch.<br>
</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Either way, patches 1-2 are:<br>
Reviewed-by: Kenneth Graunke <<a href="mailto:kenneth@whitecape.org">kenneth@whitecape.org</a>><br>
</blockquote></div><br></div></div>