This fixes 4a883966c1f74f43afc145d2c3d27af7b8c5e01a where the pipe cap
was removed
Now USER_INDEX_BUFFERS are always enabled remove the check and only
check for cmst_active
v2: Axel pointed out the code was still needed when cmst was inactive,
Rebase on master too
Fixes: 4a883966c1f7 ("gallium: remove PIPE_CAP_USER_INDEX_BUFFERS")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=99953
Reported-and-tested-by: Vinson Lee <v...@freedesktop.org> (v1)
Cc: Marek Olšák <marek.ol...@amd.com>
Cc: Axel Davy <axel.d...@ens.fr>
Signed-off-by: Mike Lothian <m...@fireburn.co.uk>
---
src/gallium/state_trackers/nine/device9.c | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/gallium/state_trackers/nine/device9.c
b/src/gallium/state_trackers/nine/device9.c
index c3924a21e2..30ab8deed7 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -473,7 +473,6 @@ NineDevice9_ctor( struct NineDevice9 *This,
/* Allocate upload helper for drivers that suck (from st pov ;). */
This->driver_caps.user_vbufs = GET_PCAP(USER_VERTEX_BUFFERS) &&
!This->csmt_active;
- This->driver_caps.user_ibufs = GET_PCAP(USER_INDEX_BUFFERS) &&
!This->csmt_active;
This->driver_caps.user_cbufs = GET_PCAP(USER_CONSTANT_BUFFERS);
This->driver_caps.user_sw_vbufs =
This->screen_sw->get_param(This->screen_sw, PIPE_CAP_USER_VERTEX_BUFFERS);
This->driver_caps.user_sw_cbufs =
This->screen_sw->get_param(This->screen_sw, PIPE_CAP_USER_CONSTANT_BUFFERS);
@@ -2896,7 +2895,7 @@ NineDevice9_DrawIndexedPrimitiveUP( struct NineDevice9
*This,
vbuf.buffer_offset -= base;
vbuf.user_buffer = NULL;
}
- if (!This->driver_caps.user_ibufs) {
+ if (!This->cmst_active) {
u_upload_data(This->context.pipe->stream_uploader,
0,
(prim_count_to_vertex_count(PrimitiveType,
PrimitiveCount)) * ibuf.index_size,
--
2.11.1
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
