<div dir="ltr">Ah that's what I did first, but figured it was probably in accurate naming after that</div><br><div class="gmail_quote"><div dir="ltr">On Sat, 25 Feb 2017 at 08:21 Axel Davy <<a href="mailto:axel.davy@ens.fr">axel.davy@ens.fr</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Hi Mike,<br class="gmail_msg">
<br class="gmail_msg">
We really want not to use user index buffers when csmt is active (thus<br class="gmail_msg">
the !This->csmt_active).<br class="gmail_msg">
This should be a one line patch to just remove the part<br class="gmail_msg">
GET_PCAP(USER_INDEX_BUFFERS)<br class="gmail_msg">
<br class="gmail_msg">
Yours,<br class="gmail_msg">
<br class="gmail_msg">
Axel Davy<br class="gmail_msg">
<br class="gmail_msg">
On 25/02/2017 06:23, Mike Lothian wrote:<br class="gmail_msg">
> This fixes 4a883966c1f74f43afc145d2c3d27af7b8c5e01a where the pipe cap<br class="gmail_msg">
> was removed<br class="gmail_msg">
><br class="gmail_msg">
> Now USER_INDEX_BUFFERS are always enabled remove code that checks for<br class="gmail_msg">
> them and works around them not being available<br class="gmail_msg">
><br class="gmail_msg">
> Signed-off-by: Mike Lothian <<a href="mailto:mike@fireburn.co.uk" class="gmail_msg" target="_blank">mike@fireburn.co.uk</a>><br class="gmail_msg">
> Cc: Marek Olšák <<a href="mailto:marek.olsak@amd.com" class="gmail_msg" target="_blank">marek.olsak@amd.com</a>><br class="gmail_msg">
> Cc: Axel Davy <<a href="mailto:axel.davy@ens.fr" class="gmail_msg" target="_blank">axel.davy@ens.fr</a>><br class="gmail_msg">
> ---<br class="gmail_msg">
>   src/gallium/state_trackers/nine/device9.c | 17 -----------------<br class="gmail_msg">
>   1 file changed, 17 deletions(-)<br class="gmail_msg">
><br class="gmail_msg">
> diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c<br class="gmail_msg">
> index b9b7a637d7..2217cc9d0c 100644<br class="gmail_msg">
> --- a/src/gallium/state_trackers/nine/device9.c<br class="gmail_msg">
> +++ b/src/gallium/state_trackers/nine/device9.c<br class="gmail_msg">
> @@ -473,7 +473,6 @@ NineDevice9_ctor( struct NineDevice9 *This,<br class="gmail_msg">
>       /* Allocate upload helper for drivers that suck (from st pov ;). */<br class="gmail_msg">
><br class="gmail_msg">
>       This->driver_caps.user_vbufs = GET_PCAP(USER_VERTEX_BUFFERS) && !This->csmt_active;<br class="gmail_msg">
> -    This->driver_caps.user_ibufs = GET_PCAP(USER_INDEX_BUFFERS) && !This->csmt_active;<br class="gmail_msg">
>       This->driver_caps.user_cbufs = GET_PCAP(USER_CONSTANT_BUFFERS);<br class="gmail_msg">
>       This->driver_caps.user_sw_vbufs = This->screen_sw->get_param(This->screen_sw, PIPE_CAP_USER_VERTEX_BUFFERS);<br class="gmail_msg">
>       This->driver_caps.user_sw_cbufs = This->screen_sw->get_param(This->screen_sw, PIPE_CAP_USER_CONSTANT_BUFFERS);<br class="gmail_msg">
> @@ -488,11 +487,6 @@ NineDevice9_ctor( struct NineDevice9 *This,<br class="gmail_msg">
>                                                   PIPE_BIND_VERTEX_BUFFER, PIPE_USAGE_STREAM);<br class="gmail_msg">
>       This->vertex_sw_uploader = u_upload_create(This->pipe_sw, 65536,<br class="gmail_msg">
>                                               PIPE_BIND_VERTEX_BUFFER, PIPE_USAGE_STREAM);<br class="gmail_msg">
> -    if (!This->driver_caps.user_ibufs)<br class="gmail_msg">
> -        This->index_uploader = u_upload_create(This->csmt_active ?<br class="gmail_msg">
> -                                                    This->pipe_secondary : This->context.pipe,<br class="gmail_msg">
> -                                               128 * 1024,<br class="gmail_msg">
> -                                               PIPE_BIND_INDEX_BUFFER, PIPE_USAGE_STREAM);<br class="gmail_msg">
>       if (!This->driver_caps.user_cbufs) {<br class="gmail_msg">
>           This->constbuf_alignment = GET_PCAP(CONSTANT_BUFFER_OFFSET_ALIGNMENT);<br class="gmail_msg">
>           This->constbuf_uploader = u_upload_create(This->context.pipe, This->vs_const_size,<br class="gmail_msg">
> @@ -2928,17 +2922,6 @@ NineDevice9_DrawIndexedPrimitiveUP( struct NineDevice9 *This,<br class="gmail_msg">
>           vbuf.buffer_offset -= base;<br class="gmail_msg">
>           vbuf.user_buffer = NULL;<br class="gmail_msg">
>       }<br class="gmail_msg">
> -    if (!This->driver_caps.user_ibufs) {<br class="gmail_msg">
> -        u_upload_data(This->index_uploader,<br class="gmail_msg">
> -                      0,<br class="gmail_msg">
> -                      (prim_count_to_vertex_count(PrimitiveType, PrimitiveCount)) * ibuf.index_size,<br class="gmail_msg">
> -                      4,<br class="gmail_msg">
> -                      ibuf.user_buffer,<br class="gmail_msg">
> -                      &ibuf.offset,<br class="gmail_msg">
> -                      &ibuf.buffer);<br class="gmail_msg">
> -        u_upload_unmap(This->index_uploader);<br class="gmail_msg">
> -        ibuf.user_buffer = NULL;<br class="gmail_msg">
> -    }<br class="gmail_msg">
><br class="gmail_msg">
>       NineBeforeDraw(This);<br class="gmail_msg">
>       nine_context_draw_indexed_primitive_from_vtxbuf_idxbuf(This, PrimitiveType,<br class="gmail_msg">
<br class="gmail_msg">
<br class="gmail_msg">
</blockquote></div>