Very noisy but you got there in the end, Reviewed-by: Edward O'Callaghan <funfunc...@folklore1984.net>
On 02/25/2017 10:50 PM, Mike Lothian wrote:
> 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 (and learn git rebase)
>
> 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: Edward O'Callaghan <funfunc...@folklore1984.net>
> Signed-off-by: Mike Lothian <m...@fireburn.co.uk>
> ---
> src/gallium/state_trackers/nine/device9.c | 3 +--
> src/gallium/state_trackers/nine/device9.h | 1 -
> 2 files changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/src/gallium/state_trackers/nine/device9.c
> b/src/gallium/state_trackers/nine/device9.c
> index c3924a21e2..843716207d 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 71ebbdc935..4b1630c40f 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;
>
signature.asc
Description: OpenPGP digital signature
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
