AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

zink: move 8bit index handling out of u_primconvert path

Browse Source 
putting this through util_translate_prim_restart_ib reduces our reliance on
u_primconvert, which ideally we don't want to be using

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5912>
This commit is contained in:
Mike Blumenkrantz
2020-07-20 09:04:21 -04:00
committed by Marge Bot
parent 5edaf081cd
commit f4583b4086
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_draw.c
+3 -3
View File
@@ -210,8 +210,7 @@ zink_draw_vbo(struct pipe_context *pctx,
bool need_index_buffer_unref = false; bool need_index_buffer_unref = false;
if (dinfo->mode >= PIPE_PRIM_QUADS || if (dinfo->mode >= PIPE_PRIM_QUADS ||
dinfo->mode == PIPE_PRIM_LINE_LOOP || dinfo->mode == PIPE_PRIM_LINE_LOOP) {
(dinfo->index_size == 1 && !screen->have_EXT_index_type_uint8)) {
if (!u_trim_pipe_prim(dinfo->mode, (unsigned *)&dinfo->count)) if (!u_trim_pipe_prim(dinfo->mode, (unsigned *)&dinfo->count))
return; return;
@@ -255,7 +254,8 @@ zink_draw_vbo(struct pipe_context *pctx,
struct pipe_resource *index_buffer = NULL; struct pipe_resource *index_buffer = NULL;
if (dinfo->index_size > 0) { if (dinfo->index_size > 0) {
uint32_t restart_index = util_prim_restart_index_from_size(dinfo->index_size); uint32_t restart_index = util_prim_restart_index_from_size(dinfo->index_size);
if ((dinfo->primitive_restart && (dinfo->restart_index != restart_index))) { if ((dinfo->primitive_restart && (dinfo->restart_index != restart_index)) ||
(!screen->have_EXT_index_type_uint8 && dinfo->index_size == 8)) {
util_translate_prim_restart_ib(pctx, dinfo, &index_buffer); util_translate_prim_restart_ib(pctx, dinfo, &index_buffer);
need_index_buffer_unref = true; need_index_buffer_unref = true;
} else { } else {