diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 08:21:31 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 08:21:31 +0200 |
| commit | bee9191042416cbfb848615189ca1e2a0069f022 (patch) | |
| tree | 8f7b2d550ca61d7a6ff10d1fb513fff371268ee0 /mesalib/src/mesa/state_tracker/st_draw.c | |
| parent | 18a8f9f6839dfd899814a76a971e720c1e622236 (diff) | |
| download | vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.tar.gz vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.tar.bz2 vcxsrv-bee9191042416cbfb848615189ca1e2a0069f022.zip | |
xwininfo libXft mesa git update 29 sep 2011
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_draw.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_draw.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_draw.c b/mesalib/src/mesa/state_tracker/st_draw.c index 39a947df7..574802084 100644 --- a/mesalib/src/mesa/state_tracker/st_draw.c +++ b/mesalib/src/mesa/state_tracker/st_draw.c @@ -267,8 +267,8 @@ st_pipe_vertex_format(GLenum type, GLuint size, GLenum format, /** - * This is very similar to vbo_all_varyings_in_vbos() but we test - * the stride. See bug 38626. + * This is very similar to vbo_all_varyings_in_vbos() but we are + * only interested in per-vertex data. See bug 38626. */ static GLboolean all_varyings_in_vbos(const struct gl_client_array *arrays[]) @@ -276,7 +276,9 @@ all_varyings_in_vbos(const struct gl_client_array *arrays[]) GLuint i; for (i = 0; i < VERT_ATTRIB_MAX; i++) - if (arrays[i]->StrideB && !_mesa_is_bufferobj(arrays[i]->BufferObj)) + if (arrays[i]->StrideB && + !arrays[i]->InstanceDivisor && + !_mesa_is_bufferobj(arrays[i]->BufferObj)) return GL_FALSE; return GL_TRUE; |