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

radv: import PS epilog from libraries if present

Browse Source 
This enables using PS epilogs with GPL.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18255>
This commit is contained in:
Samuel Pitoiset
2022-08-25 17:19:12 +02:00
committed by Marge Bot
parent dcff89994c
commit f8209ddc5b
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -197,6 +197,9 @@ radv_pipeline_destroy(struct radv_device *device, struct radv_pipeline *pipeline
if (pipeline->type == RADV_PIPELINE_GRAPHICS) { if (pipeline->type == RADV_PIPELINE_GRAPHICS) {
struct radv_graphics_pipeline *graphics_pipeline = radv_pipeline_to_graphics(pipeline); struct radv_graphics_pipeline *graphics_pipeline = radv_pipeline_to_graphics(pipeline);
if (graphics_pipeline->ps_epilog)
radv_shader_part_unref(device, graphics_pipeline->ps_epilog);
vk_free(&device->vk.alloc, graphics_pipeline->state_data); vk_free(&device->vk.alloc, graphics_pipeline->state_data);
} else if (pipeline->type == RADV_PIPELINE_COMPUTE) { } 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);
@@ -1610,6 +1613,12 @@ radv_graphics_pipeline_import_lib(struct radv_graphics_pipeline *pipeline,
pipeline->base.retained_shaders[s] = lib->base.base.retained_shaders[s]; pipeline->base.retained_shaders[s] = lib->base.base.retained_shaders[s];
} }
/* Import the PS epilog if present. */
if (lib->base.ps_epilog) {
assert(!pipeline->ps_epilog);
pipeline->ps_epilog = radv_shader_part_ref(lib->base.ps_epilog);
}
/* Import the pipeline layout. */ /* Import the pipeline layout. */
struct radv_pipeline_layout *lib_layout = &lib->layout; struct radv_pipeline_layout *lib_layout = &lib->layout;
for (uint32_t s = 0; s < lib_layout->num_sets; s++) { for (uint32_t s = 0; s < lib_layout->num_sets; s++) {
@@ -2766,7 +2775,7 @@ radv_generate_graphics_pipeline_key(const struct radv_graphics_pipeline *pipelin
if (device->primitives_generated_query) if (device->primitives_generated_query)
key.primitives_generated_query = true; key.primitives_generated_query = true;
key.ps.has_epilog = false; /* TODO: hook up PS epilogs */ key.ps.has_epilog = !!pipeline->ps_epilog;
return key; return key;
} }