summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/svga/svga_state_vdecl.c
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-03-16 15:43:00 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-03-16 15:43:00 +0000
commit74651f5738032466fceede8b8f0c3ce29a770551 (patch)
tree06b7f08959932f51cc90ebcae8d72b2884dd4e0e /src/gallium/drivers/svga/svga_state_vdecl.c
parent8767fe2437094f33db140a6b92f25116de4fc371 (diff)
downloadexternal_mesa3d-74651f5738032466fceede8b8f0c3ce29a770551.zip
external_mesa3d-74651f5738032466fceede8b8f0c3ce29a770551.tar.gz
external_mesa3d-74651f5738032466fceede8b8f0c3ce29a770551.tar.bz2
svga: Hardcode SVGA_COMBINE_USERBUFFERS to 1.
The code no longer supports otherwise -- it relies on buffers being uploaded via u_upload_mgr -- so make this clear. Also, there's no need to flush after draws from user buffers, given all user content should have been copied by then.
Diffstat (limited to 'src/gallium/drivers/svga/svga_state_vdecl.c')
-rw-r--r--src/gallium/drivers/svga/svga_state_vdecl.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/drivers/svga/svga_state_vdecl.c b/src/gallium/drivers/svga/svga_state_vdecl.c
index 2f85f94..d65c6f6 100644
--- a/src/gallium/drivers/svga/svga_state_vdecl.c
+++ b/src/gallium/drivers/svga/svga_state_vdecl.c
@@ -149,9 +149,7 @@ static int emit_hw_vdecl( struct svga_context *svga,
* userbuffers now and try to combine multiple userbuffers from
* multiple draw calls into a single host buffer for performance.
*/
- if (svga->curr.any_user_vertex_buffers &&
- SVGA_COMBINE_USERBUFFERS)
- {
+ if (svga->curr.any_user_vertex_buffers) {
ret = upload_user_buffers( svga );
if (ret)
return ret;