From: Ian Romanick <ian.d.roman...@intel.com>
Signed-off-by: Ian Romanick <ian.d.roman...@intel.com>
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
---
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 b9296a8..ef5e9c9 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 3a40a24..636ab0f 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 322f429..1eba756 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;
--
1.7.6
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
