diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-29 16:21:42 +0200 |
| commit | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (patch) | |
| tree | 0298f6e38550e2f888eab0146ce7a51a49faaa10 /mesalib/src/mesa/state_tracker/st_draw.c | |
| parent | 0e68f72b7b0ab957a0d3c9415f68e3c4f484b0b3 (diff) | |
| parent | bee9191042416cbfb848615189ca1e2a0069f022 (diff) | |
| download | vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.gz vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.tar.bz2 vcxsrv-4a9e1f51655e03da1507dabce7c4c3960e7ca607.zip | |
Merge remote-tracking branch 'origin/released'
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; |