summaryrefslogtreecommitdiffstats
path: root/src/gallium/auxiliary/util
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-11-20 20:34:12 +0100
committerMarek Olšák <[email protected]>2011-11-22 20:56:51 +0100
commit498e86e414dbf9b2f7d2f18cca908217ee644710 (patch)
tree964b0a984182a489d6933599ba62e6ae02ef1fe1 /src/gallium/auxiliary/util
parent1e53a26b9c2aab0d6ed75856b7e3d08b5590d0a2 (diff)
u_vbuf_mgr: don't reference non-native vertex buffers as native
also don't mark them as 'user', because they will be uploaded through the translate fallback anyway.
Diffstat (limited to 'src/gallium/auxiliary/util')
-rw-r--r--src/gallium/auxiliary/util/u_vbuf_mgr.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gallium/auxiliary/util/u_vbuf_mgr.c b/src/gallium/auxiliary/util/u_vbuf_mgr.c
index 179073c6145..b178f809de5 100644
--- a/src/gallium/auxiliary/util/u_vbuf_mgr.c
+++ b/src/gallium/auxiliary/util/u_vbuf_mgr.c
@@ -494,7 +494,8 @@ void u_vbuf_set_vertex_buffers(struct u_vbuf_mgr *mgrb,
mgr->b.real_vertex_buffer[i].stride =
mgr->b.vertex_buffer[i].stride = vb->stride;
- if (!vb->buffer) {
+ if (!vb->buffer ||
+ mgr->incompatible_vb[i]) {
pipe_resource_reference(&mgr->b.real_vertex_buffer[i].buffer, NULL);
continue;
}