mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

tu: Rename RASTERIZER_DISCARD state to PC_RASTER_CNTL 

It also contains the rasterization stream.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18912>
This commit is contained in:
Connor Abbott 2022-09-30 12:48:34 +02:00 committed by Marge Bot
parent 68b02ff200
commit 6b82998985
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/freedreno/vulkan/tu_cmd_buffer.c
View File

@ -2681,8 +2681,8 @@ tu_CmdBindPipeline(VkCommandBuffer commandBuffer,
UPDATE_REG(rast, gras_cl_cntl, RAST);
UPDATE_REG(rast_ds, rb_depth_cntl, RB_DEPTH_CNTL);
UPDATE_REG(ds, rb_stencil_cntl, RB_STENCIL_CNTL);
UPDATE_REG(rast, pc_raster_cntl, RASTERIZER_DISCARD);
UPDATE_REG(rast, vpc_unknown_9107, RASTERIZER_DISCARD);
UPDATE_REG(rast, pc_raster_cntl, PC_RASTER_CNTL);
UPDATE_REG(rast, vpc_unknown_9107, PC_RASTER_CNTL);
UPDATE_REG(blend, sp_blend_cntl, BLEND);
UPDATE_REG(blend, rb_blend_cntl, BLEND);
@ -3082,7 +3082,7 @@ tu_CmdSetRasterizerDiscardEnableEXT(VkCommandBuffer commandBuffer,
cmd->state.vpc_unknown_9107 |= A6XX_VPC_UNKNOWN_9107_RASTER_DISCARD;
}
cmd->state.dirty |= TU_CMD_DIRTY_RASTERIZER_DISCARD;
cmd->state.dirty |= TU_CMD_DIRTY_PC_RASTER_CNTL;
}
VKAPI_ATTR void VKAPI_CALL
@ -4643,8 +4643,8 @@ tu6_draw_common(struct tu_cmd_buffer *cmd,
tu6_build_depth_plane_z_mode(cmd, &cs);
}
if (dirty & TU_CMD_DIRTY_RASTERIZER_DISCARD) {
struct tu_cs cs = tu_cmd_dynamic_state(cmd, TU_DYNAMIC_STATE_RASTERIZER_DISCARD, 4);
if (dirty & TU_CMD_DIRTY_PC_RASTER_CNTL) {
struct tu_cs cs = tu_cmd_dynamic_state(cmd, TU_DYNAMIC_STATE_PC_RASTER_CNTL, 4);
tu_cs_emit_regs(&cs, A6XX_PC_RASTER_CNTL(.dword = cmd->state.pc_raster_cntl));
tu_cs_emit_regs(&cs, A6XX_VPC_UNKNOWN_9107(.dword = cmd->state.vpc_unknown_9107));
}

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

@ -62,7 +62,7 @@ enum tu_cmd_dirty_bits
TU_CMD_DIRTY_SHADER_CONSTS = BIT(7),
TU_CMD_DIRTY_LRZ = BIT(8),
TU_CMD_DIRTY_VS_PARAMS = BIT(9),
TU_CMD_DIRTY_RASTERIZER_DISCARD = BIT(10),
TU_CMD_DIRTY_PC_RASTER_CNTL = BIT(10),
TU_CMD_DIRTY_VIEWPORTS = BIT(11),
TU_CMD_DIRTY_BLEND = BIT(12),
TU_CMD_DIRTY_PATCH_CONTROL_POINTS = BIT(13),

6
src/freedreno/vulkan/tu_pipeline.c
View File

@ -3680,7 +3680,7 @@ tu_pipeline_builder_parse_dynamic(struct tu_pipeline_builder *builder,
case VK_DYNAMIC_STATE_RASTERIZER_DISCARD_ENABLE:
pipeline->rast.pc_raster_cntl_mask &= ~A6XX_PC_RASTER_CNTL_DISCARD;
pipeline->rast.vpc_unknown_9107_mask &= ~A6XX_VPC_UNKNOWN_9107_RASTER_DISCARD;
pipeline->dynamic_state_mask |= BIT(TU_DYNAMIC_STATE_RASTERIZER_DISCARD);
pipeline->dynamic_state_mask |= BIT(TU_DYNAMIC_STATE_PC_RASTER_CNTL);
break;
case VK_DYNAMIC_STATE_LOGIC_OP_EXT:
pipeline->blend.sp_blend_cntl_mask &= ~A6XX_SP_BLEND_CNTL_ENABLE_BLEND__MASK;
@ -3838,7 +3838,7 @@ tu_pipeline_builder_parse_libraries(struct tu_pipeline_builder *builder,
BIT(VK_DYNAMIC_STATE_SCISSOR) |
BIT(TU_DYNAMIC_STATE_RAST) |
BIT(VK_DYNAMIC_STATE_DEPTH_BIAS) |
BIT(TU_DYNAMIC_STATE_RASTERIZER_DISCARD) |
BIT(TU_DYNAMIC_STATE_PC_RASTER_CNTL) |
BIT(TU_DYNAMIC_STATE_PATCH_CONTROL_POINTS) |
BIT(TU_DYNAMIC_STATE_POLYGON_MODE) |
BIT(TU_DYNAMIC_STATE_TESS_DOMAIN_ORIGIN) |
@ -4275,7 +4275,7 @@ tu_pipeline_builder_parse_rasterization(struct tu_pipeline_builder *builder,
struct tu_cs cs;
if (tu_pipeline_static_state(pipeline, &cs, TU_DYNAMIC_STATE_RASTERIZER_DISCARD, 4)) {
if (tu_pipeline_static_state(pipeline, &cs, TU_DYNAMIC_STATE_PC_RASTER_CNTL, 4)) {
tu_cs_emit_regs(&cs, A6XX_PC_RASTER_CNTL(.dword = pipeline->rast.pc_raster_cntl));
tu_cs_emit_regs(&cs, A6XX_VPC_UNKNOWN_9107(.dword = pipeline->rast.vpc_unknown_9107));
}

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

@ -24,7 +24,7 @@ enum tu_dynamic_state
TU_DYNAMIC_STATE_RB_DEPTH_CNTL,
TU_DYNAMIC_STATE_RB_STENCIL_CNTL,
TU_DYNAMIC_STATE_VB_STRIDE,
TU_DYNAMIC_STATE_RASTERIZER_DISCARD,
TU_DYNAMIC_STATE_PC_RASTER_CNTL,
TU_DYNAMIC_STATE_BLEND,
TU_DYNAMIC_STATE_VERTEX_INPUT,
TU_DYNAMIC_STATE_PATCH_CONTROL_POINTS,