diff --git a/src/asahi/lib/agx_ppp.h b/src/asahi/lib/agx_ppp.h index adfd3908e60..e1ecf808b6e 100644 --- a/src/asahi/lib/agx_ppp.h +++ b/src/asahi/lib/agx_ppp.h @@ -46,7 +46,7 @@ agx_ppp_update_size(struct AGX_PPP_HEADER *present) if (present->x) \ size += AGX_##y##_LENGTH; PPP_CASE(fragment_control, FRAGMENT_CONTROL); - PPP_CASE(fragment_control_2, FRAGMENT_CONTROL_2); + PPP_CASE(fragment_control_2, FRAGMENT_CONTROL); PPP_CASE(fragment_front_face, FRAGMENT_FACE); PPP_CASE(fragment_front_face_2, FRAGMENT_FACE_2); PPP_CASE(fragment_front_stencil, FRAGMENT_STENCIL); diff --git a/src/asahi/lib/cmdbuf.xml b/src/asahi/lib/cmdbuf.xml index 0970eb74ba9..c7ca83648e1 100644 --- a/src/asahi/lib/cmdbuf.xml +++ b/src/asahi/lib/cmdbuf.xml @@ -407,16 +407,6 @@ - - - - - - - - - - @@ -426,9 +416,13 @@ Translucent punch through seems notably different though? --> - + - + + + + + diff --git a/src/asahi/lib/decode.c b/src/asahi/lib/decode.c index e3e39a0e6f0..8a9c7bbe635 100644 --- a/src/asahi/lib/decode.c +++ b/src/asahi/lib/decode.c @@ -441,7 +441,7 @@ agxdecode_record(uint64_t va, size_t size, bool verbose) map += AGX_PPP_HEADER_LENGTH; PPP_PRINT(map, fragment_control, FRAGMENT_CONTROL, "Fragment control"); - PPP_PRINT(map, fragment_control_2, FRAGMENT_CONTROL_2, "Fragment control 2"); + PPP_PRINT(map, fragment_control_2, FRAGMENT_CONTROL, "Fragment control 2"); PPP_PRINT(map, fragment_front_face, FRAGMENT_FACE, "Front face"); PPP_PRINT(map, fragment_front_face_2, FRAGMENT_FACE_2, "Front face 2"); PPP_PRINT(map, fragment_front_stencil, FRAGMENT_STENCIL, "Front stencil"); diff --git a/src/gallium/drivers/asahi/agx_state.c b/src/gallium/drivers/asahi/agx_state.c index 90dc5406a9c..8e5a734a064 100644 --- a/src/gallium/drivers/asahi/agx_state.c +++ b/src/gallium/drivers/asahi/agx_state.c @@ -1996,7 +1996,7 @@ agx_encode_state(struct agx_batch *batch, uint8_t *out, bool is_lines, } if (dirty.fragment_control_2) { - agx_ppp_push(&ppp, FRAGMENT_CONTROL_2, cfg) { + agx_ppp_push(&ppp, FRAGMENT_CONTROL, cfg) { /* This avoids broken derivatives along primitive edges */ cfg.disable_tri_merging = (is_lines || is_points || ctx->fs->info.disable_tri_merging);