From a339ee8d852c08ce7af51a518e0b18b9f0ab324c Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Thu, 18 Aug 2011 15:08:51 -0700 Subject: [PATCH] mesa: Remove unused gl_shader_program::Attributes Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/main/mtypes.h | 1 - src/mesa/main/shader_query.cpp | 9 ++------- src/mesa/main/shaderobj.c | 6 ------ 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index d68a589ab4a..bd9de8a3691 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2155,7 +2155,6 @@ struct gl_shader_program * * \sa gl_program::Attributes */ - struct gl_program_parameter_list *Attributes; struct string_to_uint_map *AttributeBindings; /** Transform feedback varyings */ diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index 3a40a243ffb..636ab0f8d0b 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -68,16 +68,11 @@ _mesa_BindAttribLocationARB(GLhandleARB program, GLuint index, return; } - /* this will replace the current value if it's already in the list */ - /* Add VERT_ATTRIB_GENERIC0 because that's how the linker differentiates + /* 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"); - return; - } /* * Note that this attribute binding won't go into effect until diff --git a/src/mesa/main/shaderobj.c b/src/mesa/main/shaderobj.c index 322f4290656..1eba75697f7 100644 --- a/src/mesa/main/shaderobj.c +++ b/src/mesa/main/shaderobj.c @@ -239,7 +239,6 @@ _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(); @@ -311,11 +310,6 @@ _mesa_free_shader_program_data(struct gl_context *ctx, _mesa_clear_shader_program_data(ctx, shProg); - if (shProg->Attributes) { - _mesa_free_parameter_list(shProg->Attributes); - shProg->Attributes = NULL; - } - if (shProg->AttributeBindings) { string_to_uint_map_dtor(shProg->AttributeBindings); shProg->AttributeBindings = NULL; -- 2.30.2