From 87b68e77ccd1c67cc552ff95b158d2ac32987977 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Sun, 24 Oct 2021 19:33:37 -0400 Subject: [PATCH] panfrost: Rename depth bias fields Make it clear that the distinction is the facingness of the primitives the depth bias applies to. Signed-off-by: Alyssa Rosenzweig Reviewed-by: Boris Brezillon Part-of: --- src/gallium/drivers/panfrost/pan_cmdstream.c | 4 ++-- src/panfrost/lib/genxml/v4.xml | 4 ++-- src/panfrost/lib/genxml/v5.xml | 4 ++-- src/panfrost/lib/genxml/v6.xml | 4 ++-- src/panfrost/lib/genxml/v7.xml | 4 ++-- src/panfrost/vulkan/panvk_vX_cs.c | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/panfrost/pan_cmdstream.c b/src/gallium/drivers/panfrost/pan_cmdstream.c index ae5e116b7a8..a2f2cbf6f35 100644 --- a/src/gallium/drivers/panfrost/pan_cmdstream.c +++ b/src/gallium/drivers/panfrost/pan_cmdstream.c @@ -3214,8 +3214,8 @@ panfrost_create_rasterizer_state( } pan_pack(&so->stencil_misc, STENCIL_MASK_MISC, cfg) { - cfg.depth_range_1 = cso->offset_tri; - cfg.depth_range_2 = cso->offset_tri; + cfg.front_facing_depth_bias = cso->offset_tri; + cfg.back_facing_depth_bias = cso->offset_tri; cfg.single_sampled_lines = !cso->multisample; } diff --git a/src/panfrost/lib/genxml/v4.xml b/src/panfrost/lib/genxml/v4.xml index cc39b4f50b5..cbdfd1b4cc6 100644 --- a/src/panfrost/lib/genxml/v4.xml +++ b/src/panfrost/lib/genxml/v4.xml @@ -659,8 +659,8 @@ - - + + diff --git a/src/panfrost/lib/genxml/v5.xml b/src/panfrost/lib/genxml/v5.xml index e4b0b294292..fb2e9c5400c 100644 --- a/src/panfrost/lib/genxml/v5.xml +++ b/src/panfrost/lib/genxml/v5.xml @@ -674,8 +674,8 @@ - - + + diff --git a/src/panfrost/lib/genxml/v6.xml b/src/panfrost/lib/genxml/v6.xml index 64bf6998d9d..d9004e293f6 100644 --- a/src/panfrost/lib/genxml/v6.xml +++ b/src/panfrost/lib/genxml/v6.xml @@ -786,8 +786,8 @@ - - + + diff --git a/src/panfrost/lib/genxml/v7.xml b/src/panfrost/lib/genxml/v7.xml index 770df9af7e1..027b3c532c5 100644 --- a/src/panfrost/lib/genxml/v7.xml +++ b/src/panfrost/lib/genxml/v7.xml @@ -832,8 +832,8 @@ - - + + diff --git a/src/panfrost/vulkan/panvk_vX_cs.c b/src/panfrost/vulkan/panvk_vX_cs.c index 521648d91d1..fc39ab834de 100644 --- a/src/panfrost/vulkan/panvk_vX_cs.c +++ b/src/panfrost/vulkan/panvk_vX_cs.c @@ -770,8 +770,8 @@ panvk_per_arch(emit_base_fs_rsd)(const struct panvk_device *dev, cfg.stencil_mask_misc.stencil_enable = pipeline->zs.s_test; cfg.stencil_mask_misc.alpha_to_coverage = pipeline->ms.alpha_to_coverage; cfg.stencil_mask_misc.alpha_test_compare_function = MALI_FUNC_ALWAYS; - cfg.stencil_mask_misc.depth_range_1 = pipeline->rast.depth_bias.enable; - cfg.stencil_mask_misc.depth_range_2 = pipeline->rast.depth_bias.enable; + cfg.stencil_mask_misc.front_facing_depth_bias = pipeline->rast.depth_bias.enable; + cfg.stencil_mask_misc.back_facing_depth_bias = pipeline->rast.depth_bias.enable; cfg.stencil_mask_misc.single_sampled_lines = pipeline->ms.rast_samples <= 1; if (!(pipeline->dynamic_state_mask & (1 << VK_DYNAMIC_STATE_DEPTH_BIAS))) {