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

radv: store vk_graphics_pipeline_state to radv_graphics_pipeline

Browse Source 
For gfx pipeline libraries we would have to keep track of the gfx
state, so change how it's allocated.

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-08-16 10:53:06 +02:00
parent bb6ec3067d
commit d8af521add
2 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -194,7 +194,11 @@ void
radv_pipeline_destroy(struct radv_device *device, struct radv_pipeline *pipeline, radv_pipeline_destroy(struct radv_device *device, struct radv_pipeline *pipeline,
const VkAllocationCallbacks *allocator) const VkAllocationCallbacks *allocator)
{ {
if (pipeline->type == RADV_PIPELINE_COMPUTE) { if (pipeline->type == RADV_PIPELINE_GRAPHICS) {
struct radv_graphics_pipeline *graphics_pipeline = radv_pipeline_to_graphics(pipeline);
vk_free(&device->vk.alloc, graphics_pipeline->state_data);
} else if (pipeline->type == RADV_PIPELINE_COMPUTE) {
struct radv_compute_pipeline *compute_pipeline = radv_pipeline_to_compute(pipeline); struct radv_compute_pipeline *compute_pipeline = radv_pipeline_to_compute(pipeline);
free(compute_pipeline->rt_group_handles); free(compute_pipeline->rt_group_handles);
@@ -1477,7 +1481,6 @@ radv_get_attrib_stride(const VkPipelineVertexInputStateCreateInfo *vi, uint32_t
static VkResult static VkResult
radv_pipeline_import_graphics_info(struct radv_graphics_pipeline *pipeline, radv_pipeline_import_graphics_info(struct radv_graphics_pipeline *pipeline,
struct vk_graphics_pipeline_state *state, struct vk_graphics_pipeline_state *state,
struct vk_graphics_pipeline_all_state *state_all,
const VkGraphicsPipelineCreateInfo *pCreateInfo) const VkGraphicsPipelineCreateInfo *pCreateInfo)
{ {
struct radv_device *device = pipeline->base.device; struct radv_device *device = pipeline->base.device;
@@ -1498,8 +1501,9 @@ radv_pipeline_import_graphics_info(struct radv_graphics_pipeline *pipeline,
pipeline->active_stages |= sinfo->stage; pipeline->active_stages |= sinfo->stage;
} }
return vk_graphics_pipeline_state_fill(&device->vk, state, pCreateInfo, NULL, state_all, NULL, 0, return vk_graphics_pipeline_state_fill(&device->vk, state, pCreateInfo, NULL, NULL, NULL,
NULL); VK_SYSTEM_ALLOCATION_SCOPE_OBJECT,
&pipeline->state_data);
} }
static void static void
@@ -6518,13 +6522,12 @@ 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}; 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;
result = radv_pipeline_import_graphics_info(pipeline, &state, &state_all, pCreateInfo); result = radv_pipeline_import_graphics_info(pipeline, &state, pCreateInfo);
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
return result; return result;

3
src/amd/vulkan/radv_private.h
View File

@@ -2043,6 +2043,9 @@ struct radv_graphics_pipeline {
unsigned rast_prim; unsigned rast_prim;
float line_width; float line_width;
/* For vk_graphics_pipeline_state */
void *state_data;
}; };
struct radv_compute_pipeline { struct radv_compute_pipeline {