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

radv: add radv_is_vrs_enabled()

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15792>
This commit is contained in:
Samuel Pitoiset
2022-04-07 14:21:31 +02:00
committed by Marge Bot
parent 59466d40a3
commit a0f3839ce8
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -95,6 +95,14 @@ radv_is_raster_enabled(const struct radv_pipeline *pipeline,
(pipeline->graphics.dynamic_states & RADV_DYNAMIC_RASTERIZER_DISCARD_ENABLE); (pipeline->graphics.dynamic_states & RADV_DYNAMIC_RASTERIZER_DISCARD_ENABLE);
} }
static bool
radv_is_vrs_enabled(const struct radv_pipeline *pipeline,
const VkGraphicsPipelineCreateInfo *pCreateInfo)
{
return vk_find_struct_const(pCreateInfo->pNext, PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR) ||
(pipeline->graphics.dynamic_states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE);
}
static const VkPipelineMultisampleStateCreateInfo * static const VkPipelineMultisampleStateCreateInfo *
radv_pipeline_get_multisample_state(const struct radv_pipeline *pipeline, radv_pipeline_get_multisample_state(const struct radv_pipeline *pipeline,
const VkGraphicsPipelineCreateInfo *pCreateInfo) const VkGraphicsPipelineCreateInfo *pCreateInfo)
@@ -1445,9 +1453,7 @@ radv_pipeline_needed_dynamic_state(const struct radv_pipeline *pipeline,
states &= ~RADV_DYNAMIC_LINE_STIPPLE; states &= ~RADV_DYNAMIC_LINE_STIPPLE;
} }
if (!vk_find_struct_const(pCreateInfo->pNext, if (!radv_is_vrs_enabled(pipeline, pCreateInfo))
PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR) &&
!(pipeline->graphics.dynamic_states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE))
states &= ~RADV_DYNAMIC_FRAGMENT_SHADING_RATE; states &= ~RADV_DYNAMIC_FRAGMENT_SHADING_RATE;
if (!has_color_att || !radv_pipeline_is_blend_enabled(pipeline, pCreateInfo)) if (!has_color_att || !radv_pipeline_is_blend_enabled(pipeline, pCreateInfo))
@@ -6108,9 +6114,7 @@ gfx103_pipeline_generate_vgt_draw_payload_cntl(struct radeon_cmdbuf *ctx_cs,
{ {
const struct radv_vs_output_info *outinfo = get_vs_output_info(pipeline); const struct radv_vs_output_info *outinfo = get_vs_output_info(pipeline);
bool enable_vrs = bool enable_vrs = radv_is_vrs_enabled(pipeline, pCreateInfo);
vk_find_struct_const(pCreateInfo->pNext, PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR) ||
(pipeline->graphics.dynamic_states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE);
/* Enables the second channel of the primitive export instruction. /* Enables the second channel of the primitive export instruction.
* This channel contains: VRS rate x, y, viewport and layer. * This channel contains: VRS rate x, y, viewport and layer.
@@ -6148,9 +6152,7 @@ gfx103_pipeline_generate_vrs_state(struct radeon_cmdbuf *ctx_cs,
{ {
uint32_t mode = V_028064_VRS_COMB_MODE_PASSTHRU; uint32_t mode = V_028064_VRS_COMB_MODE_PASSTHRU;
uint8_t rate_x = 0, rate_y = 0; uint8_t rate_x = 0, rate_y = 0;
bool enable_vrs = bool enable_vrs = radv_is_vrs_enabled(pipeline, pCreateInfo);
vk_find_struct_const(pCreateInfo->pNext, PIPELINE_FRAGMENT_SHADING_RATE_STATE_CREATE_INFO_KHR) ||
(pipeline->graphics.dynamic_states & RADV_DYNAMIC_FRAGMENT_SHADING_RATE);
if (!enable_vrs && gfx103_pipeline_vrs_coarse_shading(pipeline)) { if (!enable_vrs && gfx103_pipeline_vrs_coarse_shading(pipeline)) {
/* When per-draw VRS is not enabled at all, try enabling VRS coarse shading 2x2 if the driver /* When per-draw VRS is not enabled at all, try enabling VRS coarse shading 2x2 if the driver