diff options
| author | Mike Lothian <[email protected]> | 2017-02-25 11:50:44 +0000 |
|---|---|---|
| committer | Edward O'Callaghan <[email protected]> | 2017-02-25 23:20:18 +1100 |
| commit | 47c49f619045f8b3d597558adac736578c3f14cb (patch) | |
| tree | 73c9601fcfad4325db18f4cdc3e6ec22bacfb7a1 | |
| parent | abb1c645c476b5dd289ce3efae0594f8796f9cf8 (diff) | |
st/nine: Drop USER_INDEX_BUFFERS check
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 directly.
v2: Axel pointed out the code was still needed when cmst was inactive,
Rebase on master too
v3: Drop struct member user_ibufs also && fixup shortlog (Edward).
v4: Fix negation
v5: Use the right variable name csmt != cmst
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 <[email protected]> (v1)
Cc: Marek Olšák <[email protected]>
Cc: Axel Davy <[email protected]>
Signed-off-by: Edward O'Callaghan <[email protected]>
Signed-off-by: Mike Lothian <[email protected]>
Reviewed-by: Edward O'Callaghan <[email protected]>
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 3 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.h | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index c3924a21e22..843716207d6 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->csmt_active) { u_upload_data(This->context.pipe->stream_uploader, 0, (prim_count_to_vertex_count(PrimitiveType, PrimitiveCount)) * ibuf.index_size, diff --git a/src/gallium/state_trackers/nine/device9.h b/src/gallium/state_trackers/nine/device9.h index 71ebbdc935b..4b1630c40f9 100644 --- a/src/gallium/state_trackers/nine/device9.h +++ b/src/gallium/state_trackers/nine/device9.h @@ -127,7 +127,6 @@ struct NineDevice9 struct { boolean user_vbufs; - boolean user_ibufs; boolean user_cbufs; boolean user_sw_vbufs; boolean user_sw_cbufs; |