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

radv: add radv_graphics_pipeline_import_info() helper

Browse Source 
It also initializes dynamic states and active stages. It will also be
used when creating a graphics pipeline library.

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/17542>
This commit is contained in:
Samuel Pitoiset
2022-06-01 10:05:06 +02:00
parent a5f3a21261
commit 075a35e0ad
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1474,6 +1474,34 @@ radv_get_attrib_stride(const VkPipelineVertexInputStateCreateInfo *vi, uint32_t
return 0; return 0;
} }
static VkResult
radv_pipeline_import_graphics_info(struct radv_graphics_pipeline *pipeline,
struct vk_graphics_pipeline_state *state,
struct vk_graphics_pipeline_all_state *state_all,
const VkGraphicsPipelineCreateInfo *pCreateInfo)
{
struct radv_device *device = pipeline->base.device;
/* Mark all states declared dynamic at pipeline creation. */
if (pCreateInfo->pDynamicState) {
uint32_t count = pCreateInfo->pDynamicState->dynamicStateCount;
for (uint32_t s = 0; s < count; s++) {
pipeline->dynamic_states |=
radv_dynamic_state_mask(pCreateInfo->pDynamicState->pDynamicStates[s]);
}
}
/* Mark all active stages at pipeline creation. */
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
const VkPipelineShaderStageCreateInfo *sinfo = &pCreateInfo->pStages[i];
pipeline->active_stages |= sinfo->stage;
}
return vk_graphics_pipeline_state_fill(&device->vk, state, pCreateInfo, NULL, state_all, NULL, 0,
NULL);
}
static void static void
radv_pipeline_init_input_assembly_state(struct radv_graphics_pipeline *pipeline) radv_pipeline_init_input_assembly_state(struct radv_graphics_pipeline *pipeline)
{ {
@@ -6490,30 +6518,13 @@ radv_graphics_pipeline_init(struct radv_graphics_pipeline *pipeline, struct radv
const struct radv_graphics_pipeline_create_info *extra) const struct radv_graphics_pipeline_create_info *extra)
{ {
RADV_FROM_HANDLE(radv_pipeline_layout, pipeline_layout, pCreateInfo->layout); RADV_FROM_HANDLE(radv_pipeline_layout, pipeline_layout, pCreateInfo->layout);
struct vk_graphics_pipeline_all_state state_all;
struct vk_graphics_pipeline_state state = {0};
VkResult result; VkResult result;
pipeline->last_vgt_api_stage = MESA_SHADER_NONE; pipeline->last_vgt_api_stage = MESA_SHADER_NONE;
/* Mark all states declared dynamic at pipeline creation. */ result = radv_pipeline_import_graphics_info(pipeline, &state, &state_all, pCreateInfo);
if (pCreateInfo->pDynamicState) {
uint32_t count = pCreateInfo->pDynamicState->dynamicStateCount;
for (uint32_t s = 0; s < count; s++) {
pipeline->dynamic_states |=
radv_dynamic_state_mask(pCreateInfo->pDynamicState->pDynamicStates[s]);
}
}
/* Mark all active stages at pipeline creation. */
for (uint32_t i = 0; i < pCreateInfo->stageCount; i++) {
const VkPipelineShaderStageCreateInfo *sinfo = &pCreateInfo->pStages[i];
pipeline->active_stages |= sinfo->stage;
}
struct vk_graphics_pipeline_all_state all;
struct vk_graphics_pipeline_state state = {0};
result = vk_graphics_pipeline_state_fill(&device->vk, &state, pCreateInfo, NULL, &all, NULL, 0,
NULL);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;