Module: Mesa Branch: master Commit: 79f3003445e6578abc0563b421776851d6caa21f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=79f3003445e6578abc0563b421776851d6caa21f
Author: Eric Anholt <[email protected]> Date: Thu Jun 4 16:51:13 2020 -0700 turnip: Use tu_cs_emit_regs() for BLEND_CONTROL. Just a cleanup since I was in the area. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5343> --- src/freedreno/vulkan/tu_pipeline.c | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/src/freedreno/vulkan/tu_pipeline.c b/src/freedreno/vulkan/tu_pipeline.c index 4b04a98dd25..6a6fd2728aa 100644 --- a/src/freedreno/vulkan/tu_pipeline.c +++ b/src/freedreno/vulkan/tu_pipeline.c @@ -2060,33 +2060,23 @@ tu6_emit_blend_control(struct tu_cs *cs, { assert(!msaa_info->alphaToOneEnable); - uint32_t sp_blend_cntl = A6XX_SP_BLEND_CNTL_UNK8; - if (blend_enable_mask) - sp_blend_cntl |= A6XX_SP_BLEND_CNTL_ENABLED; - if (dual_src_blend) - sp_blend_cntl |= A6XX_SP_BLEND_CNTL_DUAL_COLOR_IN_ENABLE; - if (msaa_info->alphaToCoverageEnable) - sp_blend_cntl |= A6XX_SP_BLEND_CNTL_ALPHA_TO_COVERAGE; - const uint32_t sample_mask = - msaa_info->pSampleMask ? *msaa_info->pSampleMask + msaa_info->pSampleMask ? (*msaa_info->pSampleMask & 0xffff) : ((1 << msaa_info->rasterizationSamples) - 1); + tu_cs_emit_regs(cs, + A6XX_SP_BLEND_CNTL(.enabled = blend_enable_mask, + .dual_color_in_enable = dual_src_blend, + .alpha_to_coverage = msaa_info->alphaToCoverageEnable, + .unk8 = true)); + /* set A6XX_RB_BLEND_CNTL_INDEPENDENT_BLEND only when enabled? */ - uint32_t rb_blend_cntl = - A6XX_RB_BLEND_CNTL_ENABLE_BLEND(blend_enable_mask) | - A6XX_RB_BLEND_CNTL_INDEPENDENT_BLEND | - A6XX_RB_BLEND_CNTL_SAMPLE_MASK(sample_mask); - if (dual_src_blend) - rb_blend_cntl |= A6XX_RB_BLEND_CNTL_DUAL_COLOR_IN_ENABLE; - if (msaa_info->alphaToCoverageEnable) - rb_blend_cntl |= A6XX_RB_BLEND_CNTL_ALPHA_TO_COVERAGE; - - tu_cs_emit_pkt4(cs, REG_A6XX_SP_BLEND_CNTL, 1); - tu_cs_emit(cs, sp_blend_cntl); - - tu_cs_emit_pkt4(cs, REG_A6XX_RB_BLEND_CNTL, 1); - tu_cs_emit(cs, rb_blend_cntl); + tu_cs_emit_regs(cs, + A6XX_RB_BLEND_CNTL(.enable_blend = blend_enable_mask, + .independent_blend = true, + .sample_mask = sample_mask, + .dual_color_in_enable = dual_src_blend, + .alpha_to_coverage = msaa_info->alphaToCoverageEnable)); } void _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
