diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-02 06:49:56 +0000 |
| commit | e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61 (patch) | |
| tree | 115901d752ba4f277ef82564bad209082f1feb2e /mesalib/src/mesa/main/shaderapi.c | |
| parent | e4dd9264ee8d4a20eef0eec8c8bf8cff2473b46f (diff) | |
| parent | 34f1ddbb272a5ad55f56d54e2f861da6360db04f (diff) | |
| download | vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.gz vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.tar.bz2 vcxsrv-e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/shaderapi.c')
| -rw-r--r-- | mesalib/src/mesa/main/shaderapi.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/mesalib/src/mesa/main/shaderapi.c b/mesalib/src/mesa/main/shaderapi.c index 066e8b427..baebb5cd3 100644 --- a/mesalib/src/mesa/main/shaderapi.c +++ b/mesalib/src/mesa/main/shaderapi.c @@ -362,7 +362,7 @@ bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index, {
struct gl_shader_program *shProg;
const GLint size = -1; /* unknown size */
- GLint i, oldIndex;
+ GLint i;
GLenum datatype = GL_FLOAT_VEC4;
shProg = _mesa_lookup_shader_program_err(ctx, program,
@@ -385,14 +385,6 @@ bind_attrib_location(struct gl_context *ctx, GLuint program, GLuint index, return;
}
- if (shProg->LinkStatus) {
- /* get current index/location for the attribute */
- oldIndex = get_attrib_location(ctx, program, name);
- }
- else {
- oldIndex = -1;
- }
-
/* this will replace the current value if it's already in the list */
i = _mesa_add_attribute(shProg->Attributes, name, size, datatype, index);
if (i < 0) {
|