diff options
author | Ian Romanick <[email protected]> | 2011-08-26 22:58:51 -0700 |
---|---|---|
committer | Ian Romanick <[email protected]> | 2011-10-07 16:39:51 -0700 |
commit | 97a0fe8e93cc5340888ae9245b1373d195eff767 (patch) | |
tree | 9f0aa42d6f7a1eb5dc3ed174b67f14859c901d5b /src/mesa | |
parent | e2bdef53807d0f23c2a1ff326ea8190cb57aa90a (diff) |
mesa: Remove unused function _mesa_append_uniform
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Brian Paul <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/program/prog_uniform.c | 74 | ||||
-rw-r--r-- | src/mesa/program/prog_uniform.h | 4 |
2 files changed, 0 insertions, 78 deletions
diff --git a/src/mesa/program/prog_uniform.c b/src/mesa/program/prog_uniform.c index 28acb8871a7..d0b25e5c5c9 100644 --- a/src/mesa/program/prog_uniform.c +++ b/src/mesa/program/prog_uniform.c @@ -56,80 +56,6 @@ _mesa_free_uniform_list(struct gl_uniform_list *list) } -struct gl_uniform * -_mesa_append_uniform(struct gl_uniform_list *list, - const char *name, GLenum target, GLuint progPos) -{ - const GLuint oldNum = list->NumUniforms; - struct gl_uniform *uniform; - GLint index; - - assert(target == GL_VERTEX_PROGRAM_ARB || - target == GL_FRAGMENT_PROGRAM_ARB || - target == MESA_GEOMETRY_PROGRAM); - - index = _mesa_lookup_uniform(list, name); - if (index < 0) { - /* not found - append to list */ - - if (oldNum + 1 > list->Size) { - /* Need to grow the list array (alloc some extra) */ - list->Size += 4; - - /* realloc arrays */ - list->Uniforms = (struct gl_uniform *) - _mesa_realloc(list->Uniforms, - oldNum * sizeof(struct gl_uniform), - list->Size * sizeof(struct gl_uniform)); - } - - if (!list->Uniforms) { - /* out of memory */ - list->NumUniforms = 0; - list->Size = 0; - return GL_FALSE; - } - - uniform = list->Uniforms + oldNum; - - uniform->Name = _mesa_strdup(name); - uniform->VertPos = -1; - uniform->FragPos = -1; - uniform->GeomPos = -1; - uniform->Initialized = GL_FALSE; - - list->NumUniforms++; - } - else { - /* found */ - uniform = list->Uniforms + index; - } - - /* update position for the vertex or fragment program */ - if (target == GL_VERTEX_PROGRAM_ARB) { - if (uniform->VertPos != -1) { - /* this uniform is already in the list - that shouldn't happen */ - return GL_FALSE; - } - uniform->VertPos = progPos; - } else if (target == GL_FRAGMENT_PROGRAM_ARB) { - if (uniform->FragPos != -1) { - /* this uniform is already in the list - that shouldn't happen */ - return GL_FALSE; - } - uniform->FragPos = progPos; - } else { - if (uniform->GeomPos != -1) { - /* this uniform is already in the list - that shouldn't happen */ - return GL_FALSE; - } - uniform->GeomPos = progPos; - } - - return uniform; -} - - /** * Return the location/index of the named uniform in the uniform list, * or -1 if not found. diff --git a/src/mesa/program/prog_uniform.h b/src/mesa/program/prog_uniform.h index 67f78006eac..83cd3078016 100644 --- a/src/mesa/program/prog_uniform.h +++ b/src/mesa/program/prog_uniform.h @@ -72,10 +72,6 @@ _mesa_new_uniform_list(void); extern void _mesa_free_uniform_list(struct gl_uniform_list *list); -extern struct gl_uniform * -_mesa_append_uniform(struct gl_uniform_list *list, - const char *name, GLenum target, GLuint progPos); - extern GLint _mesa_lookup_uniform(const struct gl_uniform_list *list, const char *name); |