mesa: fix issues causing warnings on Windows
This commit is contained in:
committed by
Keith Whitwell
parent
9614eac85d
commit
6bc8749cd5
@@ -512,7 +512,7 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
|
||||
{
|
||||
struct gl_shader_program *shProg;
|
||||
const GLint size = -1; /* unknown size */
|
||||
GLint i;
|
||||
GLint i, oldIndex;
|
||||
GLenum datatype = GL_FLOAT_VEC4;
|
||||
|
||||
shProg = _mesa_lookup_shader_program_err(ctx, program,
|
||||
@@ -535,6 +535,14 @@ _mesa_bind_attrib_location(GLcontext *ctx, GLuint program, GLuint index,
|
||||
return;
|
||||
}
|
||||
|
||||
if (shProg->LinkStatus) {
|
||||
/* get current index/location for the attribute */
|
||||
oldIndex = _mesa_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) {
|
||||
|
||||
Reference in New Issue
Block a user