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

zink: export supported prim types

Browse Source 
this is now handled by gallium, so the related codepaths can be dropped

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10973>
This commit is contained in:
Mike Blumenkrantz
2021-05-21 07:36:29 -04:00
committed by Marge Bot
parent 8ac4be916e
commit 2953d70994
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_draw.c
-9
View File
@@ -426,15 +426,6 @@ zink_draw_vbo(struct pipe_context *pctx,
util_draw_vbo_without_prim_restart(pctx, dinfo, drawid_offset, dindirect, &draws[0]);
return;
}
if (dinfo->mode == PIPE_PRIM_QUADS ||
dinfo->mode == PIPE_PRIM_QUAD_STRIP ||
dinfo->mode == PIPE_PRIM_POLYGON ||
(dinfo->mode == PIPE_PRIM_TRIANGLE_FAN && !screen->have_triangle_fans) ||
dinfo->mode == PIPE_PRIM_LINE_LOOP) {
util_primconvert_save_rasterizer_state(ctx->primconvert, &rast_state->base);
util_primconvert_draw_vbo(ctx->primconvert, dinfo, drawid_offset, dindirect, draws, num_draws);
return;
}
if (ctx->gfx_pipeline_state.vertices_per_patch != dinfo->vertices_per_patch)
ctx->gfx_pipeline_state.dirty = true;
bool drawid_broken = ctx->drawid_broken;
src/gallium/drivers/zink/zink_screen.c
+10
View File
@@ -243,6 +243,16 @@ zink_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
return screen->info.feats.features.samplerAnisotropy;
case PIPE_CAP_EMULATE_NONFIXED_PRIMITIVE_RESTART:
return 1;
case PIPE_CAP_SUPPORTED_PRIM_MODES: {
uint32_t modes = BITFIELD_MASK(PIPE_PRIM_MAX);
modes &= ~BITFIELD_BIT(PIPE_PRIM_QUADS);
modes &= ~BITFIELD_BIT(PIPE_PRIM_QUAD_STRIP);
modes &= ~BITFIELD_BIT(PIPE_PRIM_POLYGON);
modes &= ~BITFIELD_BIT(PIPE_PRIM_LINE_LOOP);
if (!screen->have_triangle_fans)
modes &= ~BITFIELD_BIT(PIPE_PRIM_TRIANGLE_FAN);
return modes;
}
case PIPE_CAP_QUERY_MEMORY_INFO:
case PIPE_CAP_NPOT_TEXTURES: