OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tu: Rewrite remaining pipeline LRZ handling

Browse Source 
Now that the FS-specific parts are split out, the only remaining part is
the blend state part. Use the same state that we use for dynamic
blending for static blending, eliminating the last use of the pipeline
in the LRZ code. While we're at it fix a bug where dynamic blending
didn't always disable LRZ writes (even though it only mattered with a
non-conformant debug flag because we invalidated LRZ anyway).

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/25276>
This commit is contained in:
Connor Abbott
2023-09-11 17:56:38 +02:00
committed by Marge Bot
parent 41797b9e94
commit 1d74af8bb6
5 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/freedreno/vulkan/tu_cmd_buffer.cc
View File

@@ -3020,8 +3020,7 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer,
cmd->state.pipeline = tu_pipeline_to_graphics(pipeline);
cmd->state.dirty |= TU_CMD_DIRTY_DESC_SETS | TU_CMD_DIRTY_SHADER_CONSTS |
TU_CMD_DIRTY_VS_PARAMS | TU_CMD_DIRTY_LRZ |
TU_CMD_DIRTY_PROGRAM;
TU_CMD_DIRTY_VS_PARAMS | TU_CMD_DIRTY_PROGRAM;
tu_bind_vs(cmd, pipeline->shaders[MESA_SHADER_VERTEX]);
tu_bind_tcs(cmd, pipeline->shaders[MESA_SHADER_TESS_CTRL]);
@@ -3067,8 +3066,13 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer,
cmd->state.rp.sysmem_single_prim_mode = true;
}
if (pipeline->lrz.blend_valid)
cmd->state.blend_reads_dest = pipeline->lrz.lrz_status & TU_LRZ_READS_DEST;
if (pipeline->lrz_blend.valid) {
if (cmd->state.blend_reads_dest != pipeline->lrz_blend.reads_dest) {
cmd->state.blend_reads_dest = pipeline->lrz_blend.reads_dest;
cmd->state.dirty |= TU_CMD_DIRTY_LRZ;
}
}
cmd->state.pipeline_blend_lrz = pipeline->lrz_blend.valid;
if (pipeline->bandwidth.valid)
cmd->state.bandwidth = pipeline->bandwidth;

2
src/freedreno/vulkan/tu_cmd_buffer.h
View File

@@ -483,6 +483,8 @@ struct tu_cmd_state
bool stencil_back_write;
bool pipeline_feedback_loop_ds;
bool pipeline_blend_lrz;
/* VK_QUERY_PIPELINE_STATISTIC_CLIPPING_INVOCATIONS_BIT and
* VK_QUERY_TYPE_PRIMITIVES_GENERATED_EXT are allowed to run simultaniously,
* but they use the same {START,STOP}_PRIMITIVE_CTRS control.

9
src/freedreno/vulkan/tu_lrz.cc
View File

@@ -558,7 +558,6 @@ static struct A6XX_GRAS_LRZ_CNTL
tu6_calculate_lrz_state(struct tu_cmd_buffer *cmd,
const uint32_t a)
{
struct tu_pipeline *pipeline = &cmd->state.pipeline->base;
const struct tu_shader *fs = cmd->state.shaders[MESA_SHADER_FRAGMENT];
bool z_test_enable = cmd->vk.dynamic_graphics_state.ds.depth.test_enable;
bool z_write_enable = cmd->vk.dynamic_graphics_state.ds.depth.write_enable;
@@ -585,10 +584,13 @@ tu6_calculate_lrz_state(struct tu_cmd_buffer *cmd,
return gras_lrz_cntl;
}
/* See comment in tu_pipeline about disabling LRZ write for blending. */
bool reads_dest = cmd->state.blend_reads_dest;
gras_lrz_cntl.enable = true;
gras_lrz_cntl.lrz_write =
z_write_enable &&
!(pipeline->lrz.lrz_status & TU_LRZ_FORCE_DISABLE_WRITE) &&
!reads_dest &&
!(fs->fs.lrz.status & TU_LRZ_FORCE_DISABLE_WRITE);
gras_lrz_cntl.z_test_enable = z_write_enable;
gras_lrz_cntl.z_bounds_enable = z_bounds_enable;
@@ -597,9 +599,6 @@ tu6_calculate_lrz_state(struct tu_cmd_buffer *cmd,
gras_lrz_cntl.disable_on_wrong_dir = cmd->state.lrz.gpu_dir_tracking;
/* See comment in tu_pipeline about disabling LRZ write for blending. */
bool reads_dest = cmd->state.blend_reads_dest;
/* LRZ is disabled until it is cleared, which means that one "wrong"
* depth test or shader could disable LRZ until depth buffer is cleared.
*/

14
src/freedreno/vulkan/tu_pipeline.cc
View File

@@ -2159,7 +2159,8 @@ tu_pipeline_builder_parse_libraries(struct tu_pipeline_builder *builder,
if (library->state &
VK_GRAPHICS_PIPELINE_LIBRARY_FRAGMENT_OUTPUT_INTERFACE_BIT_EXT) {
pipeline->output = library->base.output;
pipeline->lrz.lrz_status |= library->base.lrz.lrz_status;
pipeline->lrz_blend.reads_dest |= library->base.lrz_blend.reads_dest;
pipeline->lrz_blend.valid |= library->base.lrz_blend.valid;
pipeline->prim_order = library->base.prim_order;
}
@@ -2956,13 +2957,12 @@ static const enum mesa_vk_dynamic_graphics_state tu_blend_lrz_state[] = {
};
static void
tu_emit_blend_lrz(struct tu_lrz_pipeline *lrz,
tu_emit_blend_lrz(struct tu_lrz_blend *lrz,
const struct vk_color_blend_state *cb,
const struct vk_render_pass_state *rp)
{
if (tu6_calc_blend_lrz(cb, rp))
lrz->lrz_status |= TU_LRZ_FORCE_DISABLE_WRITE | TU_LRZ_READS_DEST;
lrz->blend_valid = true;
lrz->reads_dest = tu6_calc_blend_lrz(cb, rp);
lrz->valid = true;
}
static const enum mesa_vk_dynamic_graphics_state tu_blend_state[] = {
@@ -3417,7 +3417,7 @@ tu_pipeline_builder_emit_state(struct tu_pipeline_builder *builder,
builder->graphics_state.ms->alpha_to_one_enable,
builder->graphics_state.ms->sample_mask);
if (EMIT_STATE(blend_lrz, attachments_valid))
tu_emit_blend_lrz(&pipeline->lrz, cb,
tu_emit_blend_lrz(&pipeline->lrz_blend, cb,
builder->graphics_state.rp);
if (EMIT_STATE(bandwidth, attachments_valid))
tu_calc_bandwidth(&pipeline->bandwidth, cb,
@@ -3605,7 +3605,7 @@ tu_emit_draw_state(struct tu_cmd_buffer *cmd)
cmd->vk.dynamic_graphics_state.ms.sample_mask);
if (EMIT_STATE(blend_lrz) ||
((cmd->state.dirty & TU_CMD_DIRTY_SUBPASS) &&
!cmd->state.pipeline->base.lrz.blend_valid)) {
!cmd->state.pipeline_blend_lrz)) {
bool blend_reads_dest = tu6_calc_blend_lrz(&cmd->vk.dynamic_graphics_state.cb,
&cmd->state.vk_rp);
if (blend_reads_dest != cmd->state.blend_reads_dest) {

9
src/freedreno/vulkan/tu_pipeline.h
View File

@@ -36,11 +36,10 @@ enum tu_dynamic_state
struct cache_entry;
struct tu_lrz_pipeline
struct tu_lrz_blend
{
uint32_t lrz_status;
bool blend_valid;
bool valid;
bool reads_dest;
};
struct tu_bandwidth
@@ -158,7 +157,7 @@ struct tu_pipeline
struct tu_program_state program;
struct tu_lrz_pipeline lrz;
struct tu_lrz_blend lrz_blend;
struct tu_bandwidth bandwidth;
void *executables_mem_ctx;