OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util/primconvert: force restart rewrites if original primtype wasn't supported

Browse Source 
if we're doing a primtype change, the restart needs to be eliminated to
avoid losing restart data after the rewrite

Fixes: 583070748c ("util/primconvert: handle rewriting of prim-restart draws with unsupported primtype")

Acked-by: Rob Clark <robdclark@chromium.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12625>
This commit is contained in:
Mike Blumenkrantz
2021-08-30 16:22:08 -04:00
committed by Marge Bot
parent f7e575ce0d
commit 5bb747abd9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/gallium/auxiliary/indices/u_primconvert.c
View File

@@ -179,10 +179,12 @@ util_primconvert_draw_vbo(struct primconvert_context *pc,
src = (const uint8_t *)src; src = (const uint8_t *)src;
/* if the resulting primitive type is not supported by the driver for primitive restart, /* if the resulting primitive type is not supported by the driver for primitive restart,
* or if the original primitive type was not supported by the driver,
* the draw needs to be rewritten to not use primitive restart * the draw needs to be rewritten to not use primitive restart
*/ */
if (info->primitive_restart && if (info->primitive_restart &&
!(pc->cfg.restart_primtypes_mask & BITFIELD_BIT(mode))) { (!(pc->cfg.restart_primtypes_mask & BITFIELD_BIT(mode)) ||
!(pc->cfg.primtypes_mask & BITFIELD_BIT(info->mode)))) {
/* step 1: rewrite draw to not use primitive primitive restart; /* step 1: rewrite draw to not use primitive primitive restart;
* this pre-filters degenerate primitives * this pre-filters degenerate primitives
*/ */