---
src/mesa/main/varray.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index f8837e8..e7ff8d7 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -708,6 +708,7 @@ static GLuint
get_vertex_array_attrib(struct gl_context *ctx, GLuint index, GLenum pname,
const char *caller)
{
+ const struct gl_array_object *arrayObj = ctx->Array.ArrayObj;
const struct gl_vertex_attrib_array *array;
if (index >= ctx->Const.VertexProgram.MaxAttribs) {
@@ -715,7 +716,7 @@ get_vertex_array_attrib(struct gl_context *ctx, GLuint
index, GLenum pname,
return 0;
}
- array = gl_vertex_attrib_array(ctx, VERT_ATTRIB_GENERIC(index));
+ array = &arrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(index)];
switch (pname) {
case GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB:
@@ -729,7 +730,7 @@ get_vertex_array_attrib(struct gl_context *ctx, GLuint
index, GLenum pname,
case GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB:
return array->Normalized;
case GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB:
- return gl_vertex_buffer_binding(ctx,
array->VertexBinding)->BufferObj->Name;
+ return arrayObj->VertexBinding[array->VertexBinding].BufferObj->Name;
case GL_VERTEX_ATTRIB_ARRAY_INTEGER:
if ((_mesa_is_desktop_gl(ctx)
&& (ctx->Version >= 30 || ctx->Extensions.EXT_gpu_shader4))
@@ -740,7 +741,7 @@ get_vertex_array_attrib(struct gl_context *ctx, GLuint
index, GLenum pname,
case GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ARB:
if ((_mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_instanced_arrays)
|| _mesa_is_gles3(ctx)) {
- return gl_vertex_buffer_binding(ctx,
array->VertexBinding)->InstanceDivisor;
+ return arrayObj->VertexBinding[array->VertexBinding].InstanceDivisor;
}
case GL_VERTEX_ATTRIB_BINDING:
if (_mesa_is_desktop_gl(ctx)) {
--
1.8.4.rc3
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
