From 015d4f61ef9116c9e844299ab9f2b15c653c0450 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Wed, 17 Aug 2011 15:38:53 -0700 Subject: mesa: Add gl_shader_program::AttributeBindings This currently mirrors the state tracking gl_shader_program::Attributes, but I'm working towards eliminating that. Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/main/mtypes.h | 11 ++++++++++- src/mesa/main/shader_query.cpp | 5 +++++ src/mesa/main/shaderobj.c | 9 +++++++++ 3 files changed, 24 insertions(+), 1 deletion(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index b29cdedab45..d68a589ab4a 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2146,8 +2146,17 @@ struct gl_shader_program GLuint NumShaders; /**< number of attached shaders */ struct gl_shader **Shaders; /**< List of attached the shaders */ - /** User-defined attribute bindings (glBindAttribLocation) */ + /** + * User-defined attribute bindings + * + * These are set via \c glBindAttribLocation and are used to direct the + * GLSL linker. These are \b not the values used in the compiled shader, + * and they are \b not the values returned by \c glGetAttribLocation. + * + * \sa gl_program::Attributes + */ struct gl_program_parameter_list *Attributes; + struct string_to_uint_map *AttributeBindings; /** Transform feedback varyings */ struct { diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index b754b1f64a1..424610d6d5a 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -32,6 +32,7 @@ #include "glsl_symbol_table.h" #include "ir.h" #include "shaderobj.h" +#include "program/hash_table.h" extern "C" { #include "shaderapi.h" @@ -67,6 +68,10 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, } /* this will replace the current value if it's already in the list */ + /* Add VERT_ATTRIB_GENERIC0 because that's how the linker differentiates + * between built-in attributes and user-defined attributes. + */ + shProg->AttributeBindings->put(index + VERT_ATTRIB_GENERIC0, name); i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index); if (i < 0) { _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindAttribLocation"); diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index f128648f477..322f4290656 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -38,6 +38,7 @@ #include "program/program.h" #include "program/prog_parameter.h" #include "program/prog_uniform.h" +#include "program/hash_table.h" #include "ralloc.h" /**********************************************************************/ @@ -239,6 +240,9 @@ _mesa_init_shader_program(struct gl_context *ctx, struct gl_shader_program *prog prog->Type = GL_SHADER_PROGRAM_MESA; prog->RefCount = 1; prog->Attributes = _mesa_new_parameter_list(); + + prog->AttributeBindings = string_to_uint_map_ctor(); + #if FEATURE_ARB_geometry_shader4 prog->Geom.VerticesOut = 0; prog->Geom.InputType = GL_TRIANGLES; @@ -312,6 +316,11 @@ _mesa_free_shader_program_data(struct gl_context *ctx, shProg->Attributes = NULL; } + if (shProg->AttributeBindings) { + string_to_uint_map_dtor(shProg->AttributeBindings); + shProg->AttributeBindings = NULL; + } + /* detach shaders */ for (i = 0; i < shProg->NumShaders; i++) { _mesa_reference_shader(ctx, &shProg->Shaders[i], NULL); -- cgit v1.2.3