AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv: Implement VK_KHR_pipeline_library

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Caio Oliveira <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16970>
This commit is contained in:
Jason Ekstrand
2020-09-07 02:24:20 -05:00
committed by Marge Bot
parent 4388b8b253
commit 93526c89c5
2 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/intel/vulkan/anv_device.c
+1
View File
@@ -228,6 +228,7 @@ get_device_extensions(const struct anv_physical_device *device,
INTEL_DEBUG(DEBUG_NO_OACONFIG)) &&
device->use_call_secondary,
.KHR_pipeline_executable_properties = true,
.KHR_pipeline_library = true,
.KHR_push_descriptor = true,
.KHR_ray_query = device->info.has_ray_tracing,
.KHR_relaxed_block_layout = true,
src/intel/vulkan/anv_pipeline.c
+26 -2
View File
@@ -3042,9 +3042,20 @@ anv_ray_tracing_pipeline_create(
assert(pCreateInfo->sType == VK_STRUCTURE_TYPE_RAY_TRACING_PIPELINE_CREATE_INFO_KHR);
uint32_t group_count = pCreateInfo->groupCount;
if (pCreateInfo->pLibraryInfo) {
for (uint32_t l = 0; l < pCreateInfo->pLibraryInfo->libraryCount; l++) {
ANV_FROM_HANDLE(anv_pipeline, library,
pCreateInfo->pLibraryInfo->pLibraries[l]);
struct anv_ray_tracing_pipeline *rt_library =
anv_pipeline_to_ray_tracing(library);
group_count += rt_library->group_count;
}
}
VK_MULTIALLOC(ma);
VK_MULTIALLOC_DECL(&ma, struct anv_ray_tracing_pipeline, pipeline, 1);
VK_MULTIALLOC_DECL(&ma, struct anv_rt_shader_group, groups, pCreateInfo->groupCount);
VK_MULTIALLOC_DECL(&ma, struct anv_rt_shader_group, groups, group_count);
if (!vk_multialloc_zalloc2(&ma, &device->vk.alloc, pAllocator,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE))
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -3057,7 +3068,7 @@ anv_ray_tracing_pipeline_create(
return result;
}
pipeline->group_count = pCreateInfo->groupCount;
pipeline->group_count = group_count;
pipeline->groups = groups;
ASSERTED const VkShaderStageFlags ray_tracing_stages =
@@ -3114,6 +3125,18 @@ anv_ray_tracing_pipeline_create(
return result;
}
if (pCreateInfo->pLibraryInfo) {
uint32_t g = pCreateInfo->groupCount;
for (uint32_t l = 0; l < pCreateInfo->pLibraryInfo->libraryCount; l++) {
ANV_FROM_HANDLE(anv_pipeline, library,
pCreateInfo->pLibraryInfo->pLibraries[l]);
struct anv_ray_tracing_pipeline *rt_library =
anv_pipeline_to_ray_tracing(library);
for (uint32_t lg = 0; lg < rt_library->group_count; lg++)
pipeline->groups[g++] = rt_library->groups[lg];
}
}
anv_genX(device->info, ray_tracing_pipeline_emit)(pipeline);
*pPipeline = anv_pipeline_to_handle(&pipeline->base);
@@ -3414,6 +3437,7 @@ anv_GetRayTracingShaderGroupHandlesKHR(
struct anv_ray_tracing_pipeline *rt_pipeline =
anv_pipeline_to_ray_tracing(pipeline);
assert(firstGroup + groupCount <= rt_pipeline->group_count);
for (uint32_t i = 0; i < groupCount; i++) {
struct anv_rt_shader_group *group = &rt_pipeline->groups[firstGroup + i];
memcpy(pData, group->handle, sizeof(group->handle));