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

radv: properly ignore PSO states that are dynamic

Browse Source 
They should be ignored because it's allowed to have garbage in there.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17677>
This commit is contained in:
Samuel Pitoiset
2022-07-21 12:50:26 +02:00
committed by Marge Bot
parent fdab8fef7a
commit 101f9dd8cf
1 changed files with 82 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/amd/vulkan/radv_pipeline.c
View File

@@ -1599,7 +1599,9 @@ radv_pipeline_init_input_assembly_info(struct radv_graphics_pipeline *pipeline,
struct radv_input_assembly_info info = {0}; struct radv_input_assembly_info info = {0};
info.primitive_topology = si_translate_prim(ia->topology); info.primitive_topology = si_translate_prim(ia->topology);
info.primitive_restart_enable = !!ia->primitiveRestartEnable;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_PRIMITIVE_RESTART_ENABLE))
info.primitive_restart_enable = !!ia->primitiveRestartEnable;
return info; return info;
} }
@@ -1661,16 +1663,31 @@ radv_pipeline_init_rasterization_info(struct radv_graphics_pipeline *pipeline,
const VkPipelineRasterizationStateCreateInfo *rs = pCreateInfo->pRasterizationState; const VkPipelineRasterizationStateCreateInfo *rs = pCreateInfo->pRasterizationState;
struct radv_rasterization_info info = {0}; struct radv_rasterization_info info = {0};
info.discard_enable = rs->rasterizerDiscardEnable; if (!(pipeline->dynamic_states & RADV_DYNAMIC_RASTERIZER_DISCARD_ENABLE))
info.front_face = rs->frontFace; info.discard_enable = rs->rasterizerDiscardEnable;
info.cull_mode = rs->cullMode;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_FRONT_FACE))
info.front_face = rs->frontFace;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_CULL_MODE))
info.cull_mode = rs->cullMode;
info.polygon_mode = si_translate_fill(rs->polygonMode); info.polygon_mode = si_translate_fill(rs->polygonMode);
info.depth_bias_enable = rs->depthBiasEnable;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_BIAS_ENABLE))
info.depth_bias_enable = rs->depthBiasEnable;
info.depth_clamp_enable = rs->depthClampEnable; info.depth_clamp_enable = rs->depthClampEnable;
info.line_width = rs->lineWidth;
info.depth_bias_constant_factor = rs->depthBiasConstantFactor; if (!(pipeline->dynamic_states & RADV_DYNAMIC_LINE_WIDTH))
info.depth_bias_clamp = rs->depthBiasClamp; info.line_width = rs->lineWidth;
info.depth_bias_slope_factor = rs->depthBiasSlopeFactor;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_BIAS)) {
info.depth_bias_constant_factor = rs->depthBiasConstantFactor;
info.depth_bias_clamp = rs->depthBiasClamp;
info.depth_bias_slope_factor = rs->depthBiasSlopeFactor;
}
info.depth_clip_disable = rs->depthClampEnable; info.depth_clip_disable = rs->depthClampEnable;
const VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *provoking_vtx_info = const VkPipelineRasterizationProvokingVertexStateCreateInfoEXT *provoking_vtx_info =
@@ -1691,8 +1708,11 @@ radv_pipeline_init_rasterization_info(struct radv_graphics_pipeline *pipeline,
if (rast_line_info) { if (rast_line_info) {
info.stippled_line_enable = rast_line_info->stippledLineEnable; info.stippled_line_enable = rast_line_info->stippledLineEnable;
info.line_raster_mode = rast_line_info->lineRasterizationMode; info.line_raster_mode = rast_line_info->lineRasterizationMode;
info.line_stipple_factor = rast_line_info->lineStippleFactor;
info.line_stipple_pattern = rast_line_info->lineStipplePattern; if (!(pipeline->dynamic_states & RADV_DYNAMIC_LINE_STIPPLE)) {
info.line_stipple_factor = rast_line_info->lineStippleFactor;
info.line_stipple_pattern = rast_line_info->lineStipplePattern;
}
} }
const VkPipelineRasterizationDepthClipStateCreateInfoEXT *depth_clip_state = const VkPipelineRasterizationDepthClipStateCreateInfoEXT *depth_clip_state =
@@ -1787,27 +1807,51 @@ radv_pipeline_init_depth_stencil_info(struct radv_graphics_pipeline *pipeline,
if (radv_is_raster_enabled(pipeline, pCreateInfo) && if (radv_is_raster_enabled(pipeline, pCreateInfo) &&
(ri->depthAttachmentFormat != VK_FORMAT_UNDEFINED || (ri->depthAttachmentFormat != VK_FORMAT_UNDEFINED ||
ri->stencilAttachmentFormat != VK_FORMAT_UNDEFINED)) { ri->stencilAttachmentFormat != VK_FORMAT_UNDEFINED)) {
info.depth_bounds_test_enable = ds->depthBoundsTestEnable; if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_BOUNDS_TEST_ENABLE))
info.depth_bounds.min = ds->minDepthBounds; info.depth_bounds_test_enable = ds->depthBoundsTestEnable;
info.depth_bounds.max = ds->maxDepthBounds;
info.stencil_test_enable = ds->stencilTestEnable; if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_BOUNDS)) {
info.front.fail_op = ds->front.failOp; info.depth_bounds.min = ds->minDepthBounds;
info.front.pass_op = ds->front.passOp; info.depth_bounds.max = ds->maxDepthBounds;
info.front.depth_fail_op = ds->front.depthFailOp; }
info.front.compare_op = ds->front.compareOp;
info.front.compare_mask = ds->front.compareMask; if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_TEST_ENABLE))
info.front.write_mask = ds->front.writeMask; info.depth_test_enable = ds->depthTestEnable;
info.front.reference = ds->front.reference;
info.back.fail_op = ds->back.failOp; if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_WRITE_ENABLE))
info.back.pass_op = ds->back.passOp; info.depth_write_enable = ds->depthWriteEnable;
info.back.depth_fail_op = ds->back.depthFailOp;
info.back.compare_op = ds->back.compareOp; if (!(pipeline->dynamic_states & RADV_DYNAMIC_DEPTH_COMPARE_OP))
info.back.compare_mask = ds->back.compareMask; info.depth_compare_op = ds->depthCompareOp;
info.back.write_mask = ds->back.writeMask;
info.back.reference = ds->back.reference; if (!(pipeline->dynamic_states & RADV_DYNAMIC_STENCIL_COMPARE_MASK)) {
info.depth_test_enable = ds->depthTestEnable; info.front.compare_mask = ds->front.compareMask;
info.depth_write_enable = ds->depthWriteEnable; info.back.compare_mask = ds->back.compareMask;
info.depth_compare_op = ds->depthCompareOp; }
if (!(pipeline->dynamic_states & RADV_DYNAMIC_STENCIL_WRITE_MASK)) {
info.front.write_mask = ds->front.writeMask;
info.back.write_mask = ds->back.writeMask;
}
if (!(pipeline->dynamic_states & RADV_DYNAMIC_STENCIL_REFERENCE)) {
info.front.reference = ds->front.reference;
info.back.reference = ds->back.reference;
}
if (!(pipeline->dynamic_states & RADV_DYNAMIC_STENCIL_TEST_ENABLE))
info.stencil_test_enable = ds->stencilTestEnable;
if (!(pipeline->dynamic_states & RADV_DYNAMIC_STENCIL_OP)) {
info.front.fail_op = ds->front.failOp;
info.front.pass_op = ds->front.passOp;
info.front.depth_fail_op = ds->front.depthFailOp;
info.front.compare_op = ds->front.compareOp;
info.back.fail_op = ds->back.failOp;
info.back.pass_op = ds->back.passOp;
info.back.depth_fail_op = ds->back.depthFailOp;
info.back.compare_op = ds->back.compareOp;
}
} }
return info; return info;
@@ -1869,17 +1913,19 @@ radv_pipeline_init_color_blend_info(struct radv_graphics_pipeline *pipeline,
} }
info.att_count = cb->attachmentCount; info.att_count = cb->attachmentCount;
for (uint32_t i = 0; i < 4; i++) { if (!(pipeline->dynamic_states & RADV_DYNAMIC_BLEND_CONSTANTS)) {
info.blend_constants[i] = cb->blendConstants[i]; for (uint32_t i = 0; i < 4; i++) {
info.blend_constants[i] = cb->blendConstants[i];
}
} }
info.logic_op_enable = cb->logicOpEnable; info.logic_op_enable = cb->logicOpEnable;
if (info.logic_op_enable) if (info.logic_op_enable && !(pipeline->dynamic_states & RADV_DYNAMIC_LOGIC_OP))
info.logic_op = si_translate_blend_logic_op(cb->logicOp); info.logic_op = si_translate_blend_logic_op(cb->logicOp);
const VkPipelineColorWriteCreateInfoEXT *color_write_info = const VkPipelineColorWriteCreateInfoEXT *color_write_info =
vk_find_struct_const(cb->pNext, PIPELINE_COLOR_WRITE_CREATE_INFO_EXT); vk_find_struct_const(cb->pNext, PIPELINE_COLOR_WRITE_CREATE_INFO_EXT);
if (color_write_info) { if (color_write_info && !(pipeline->dynamic_states & RADV_DYNAMIC_COLOR_WRITE_ENABLE)) {
for (uint32_t i = 0; i < color_write_info->attachmentCount; i++) { for (uint32_t i = 0; i < color_write_info->attachmentCount; i++) {
info.color_write_enable |= info.color_write_enable |=
color_write_info->pColorWriteEnables[i] ? (0xfu << (i * 4)) : 0; color_write_info->pColorWriteEnables[i] ? (0xfu << (i * 4)) : 0;