fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-06-09 03:38:18 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

asahi: fix depth bias interactions with points/lines

Browse source 
we need to apply depth bias for tris with point/line poly mode (according to
offset_point/offset_line), but we need to NOT apply depth bias for API-level
points/lines. weirdly the hw is sensitive to that last part.

fixes z-fighting with FreeCAD.

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28483>
This commit is contained in:
Alyssa Rosenzweig 2024-02-20 11:05:56 -04:00 • committed by Marge Bot
parent 2c40768207
commit 69dc5bed89
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/asahi/agx_state.c
View file

@ -408,6 +408,7 @@ agx_create_rs_state(struct pipe_context *ctx,
so->polygon_mode = agx_translate_polygon_mode(cso->fill_front);
so->line_width = agx_pack_line_width(cso->line_width);
so->depth_bias = util_get_offset(cso, cso->fill_front);
return so;
}
@ -423,9 +424,9 @@ agx_bind_rasterizer_state(struct pipe_context *pctx, void *cso)
/* Check if scissor or depth bias state has changed, since scissor/depth bias
* enable is part of the rasterizer state but everything else needed for
* scissors and depth bias is part of the scissor/depth bias arrays */
bool scissor_zbias_changed =
base_cso_changed || (ctx->rast->base.scissor != so->base.scissor) ||
(ctx->rast->base.offset_tri != so->base.offset_tri);
bool scissor_zbias_changed = base_cso_changed ||
(ctx->rast->base.scissor != so->base.scissor) ||
(ctx->rast->depth_bias != so->depth_bias);
ctx->dirty |= AGX_DIRTY_RS;
@ -3663,7 +3664,7 @@ agx_encode_state(struct agx_batch *batch, uint8_t *out)
struct agx_pool *pool = &batch->pool;
if ((ctx->dirty & AGX_DIRTY_RS) && ctx->rast->base.offset_tri) {
if ((ctx->dirty & AGX_DIRTY_RS) && ctx->rast->depth_bias) {
agx_upload_depth_bias(batch, &ctx->rast->base);
ctx->dirty |= AGX_DIRTY_SCISSOR_ZBIAS;
}
@ -3725,7 +3726,8 @@ agx_encode_state(struct agx_batch *batch, uint8_t *out)
cfg.stencil_test_enable = ctx->zs->base.stencil[0].enabled;
cfg.two_sided_stencil = ctx->zs->base.stencil[1].enabled;
cfg.depth_bias_enable = rast->base.offset_tri;
cfg.depth_bias_enable =
rast->depth_bias && object_type == AGX_OBJECT_TYPE_TRIANGLE;
/* Always enable scissoring so we may scissor to the viewport (TODO:
* optimize this out if the viewport is the default and the app does

1
src/gallium/drivers/asahi/agx_state.h
View file

@ -809,6 +809,7 @@ struct agx_rasterizer {
uint8_t cull[AGX_CULL_LENGTH];
uint8_t line_width;
uint8_t polygon_mode;
bool depth_bias;
};
struct agx_query {