Module: Mesa Branch: main Commit: d608706875996b05df48b0e35ee0456f0f2ae8cf URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d608706875996b05df48b0e35ee0456f0f2ae8cf
Author: Lionel Landwerlin <[email protected]> Date: Fri Dec 9 15:54:57 2022 +0200 Revert "anv: compile anv_acceleration_structure.c" This reverts commit 74d0be27ae9eb666df948874a20a3b4464df7db1. Also remove anv_acceleration_structure.c, it was meant to be removed earlier. There was probably a rebase issue somewhere. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20248> --- src/intel/vulkan/anv_acceleration_structure.c | 250 -------------------------- src/intel/vulkan/meson.build | 1 - 2 files changed, 251 deletions(-) diff --git a/src/intel/vulkan/anv_acceleration_structure.c b/src/intel/vulkan/anv_acceleration_structure.c deleted file mode 100644 index b8623ac97b7..00000000000 --- a/src/intel/vulkan/anv_acceleration_structure.c +++ /dev/null @@ -1,250 +0,0 @@ -/* - * Copyright © 2020 Intel Corporation - * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the - * Software is furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice (including the next - * paragraph) shall be included in all copies or substantial portions of the - * Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS - * IN THE SOFTWARE. - */ - -#include "anv_private.h" - -void -anv_GetAccelerationStructureBuildSizesKHR( - VkDevice device, - VkAccelerationStructureBuildTypeKHR buildType, - const VkAccelerationStructureBuildGeometryInfoKHR* pBuildInfo, - const uint32_t* pMaxPrimitiveCounts, - VkAccelerationStructureBuildSizesInfoKHR* pSizeInfo) -{ - assert(pSizeInfo->sType == - VK_STRUCTURE_TYPE_ACCELERATION_STRUCTURE_BUILD_SIZES_INFO_KHR); - - pSizeInfo->accelerationStructureSize = 0; /* TODO */ - - uint64_t cpu_build_scratch_size = 0; /* TODO */ - uint64_t cpu_update_scratch_size = cpu_build_scratch_size; - - uint64_t gpu_build_scratch_size = 0; /* TODO */ - uint64_t gpu_update_scratch_size = gpu_build_scratch_size; - - switch (buildType) { - case VK_ACCELERATION_STRUCTURE_BUILD_TYPE_HOST_KHR: - pSizeInfo->buildScratchSize = cpu_build_scratch_size; - pSizeInfo->updateScratchSize = cpu_update_scratch_size; - break; - - case VK_ACCELERATION_STRUCTURE_BUILD_TYPE_DEVICE_KHR: - pSizeInfo->buildScratchSize = gpu_build_scratch_size; - pSizeInfo->updateScratchSize = gpu_update_scratch_size; - break; - - case VK_ACCELERATION_STRUCTURE_BUILD_TYPE_HOST_OR_DEVICE_KHR: - pSizeInfo->buildScratchSize = MAX2(cpu_build_scratch_size, - gpu_build_scratch_size); - pSizeInfo->updateScratchSize = MAX2(cpu_update_scratch_size, - gpu_update_scratch_size); - break; - - default: - unreachable("Invalid acceleration structure build type"); - } -} - -VkResult -anv_CreateAccelerationStructureKHR( - VkDevice _device, - const VkAccelerationStructureCreateInfoKHR* pCreateInfo, - const VkAllocationCallbacks* pAllocator, - VkAccelerationStructureKHR* pAccelerationStructure) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - ANV_FROM_HANDLE(anv_buffer, buffer, pCreateInfo->buffer); - struct anv_acceleration_structure *accel; - - accel = vk_zalloc2(&device->vk.alloc, pAllocator, sizeof(*accel), 8, - VK_SYSTEM_ALLOCATION_SCOPE_OBJECT); - if (accel == NULL) - return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); - - vk_object_base_init(&device->vk, &accel->base, - VK_OBJECT_TYPE_ACCELERATION_STRUCTURE_KHR); - - accel->size = pCreateInfo->size; - accel->address = anv_address_add(buffer->address, pCreateInfo->offset); - - *pAccelerationStructure = anv_acceleration_structure_to_handle(accel); - - return VK_SUCCESS; -} - -void -anv_DestroyAccelerationStructureKHR( - VkDevice _device, - VkAccelerationStructureKHR accelerationStructure, - const VkAllocationCallbacks* pAllocator) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - ANV_FROM_HANDLE(anv_acceleration_structure, accel, accelerationStructure); - - if (!accel) - return; - - vk_object_base_finish(&accel->base); - vk_free2(&device->vk.alloc, pAllocator, accel); -} - -VkDeviceAddress -anv_GetAccelerationStructureDeviceAddressKHR( - VkDevice device, - const VkAccelerationStructureDeviceAddressInfoKHR* pInfo) -{ - ANV_FROM_HANDLE(anv_acceleration_structure, accel, - pInfo->accelerationStructure); - - assert(!anv_address_is_null(accel->address)); - - return anv_address_physical(accel->address); -} - -void -anv_GetDeviceAccelerationStructureCompatibilityKHR( - VkDevice device, - const VkAccelerationStructureVersionInfoKHR* pVersionInfo, - VkAccelerationStructureCompatibilityKHR* pCompatibility) -{ - unreachable("Unimplemented"); -} - -VkResult -anv_BuildAccelerationStructuresKHR( - VkDevice _device, - VkDeferredOperationKHR deferredOperation, - uint32_t infoCount, - const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, - const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - unreachable("Unimplemented"); - return vk_error(device, VK_ERROR_FEATURE_NOT_PRESENT); -} - -VkResult -anv_CopyAccelerationStructureKHR( - VkDevice _device, - VkDeferredOperationKHR deferredOperation, - const VkCopyAccelerationStructureInfoKHR* pInfo) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - unreachable("Unimplemented"); - return vk_error(device, VK_ERROR_FEATURE_NOT_PRESENT); -} - -VkResult -anv_CopyAccelerationStructureToMemoryKHR( - VkDevice _device, - VkDeferredOperationKHR deferredOperation, - const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - unreachable("Unimplemented"); - return vk_error(device, VK_ERROR_FEATURE_NOT_PRESENT); -} - -VkResult -anv_CopyMemoryToAccelerationStructureKHR( - VkDevice _device, - VkDeferredOperationKHR deferredOperation, - const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - unreachable("Unimplemented"); - return vk_error(device, VK_ERROR_FEATURE_NOT_PRESENT); -} - -VkResult -anv_WriteAccelerationStructuresPropertiesKHR( - VkDevice _device, - uint32_t accelerationStructureCount, - const VkAccelerationStructureKHR* pAccelerationStructures, - VkQueryType queryType, - size_t dataSize, - void* pData, - size_t stride) -{ - ANV_FROM_HANDLE(anv_device, device, _device); - unreachable("Unimplemented"); - return vk_error(device, VK_ERROR_FEATURE_NOT_PRESENT); -} - -void -anv_CmdBuildAccelerationStructuresKHR( - VkCommandBuffer commandBuffer, - uint32_t infoCount, - const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, - const VkAccelerationStructureBuildRangeInfoKHR* const* ppBuildRangeInfos) -{ - unreachable("Unimplemented"); -} - -void -anv_CmdBuildAccelerationStructuresIndirectKHR( - VkCommandBuffer commandBuffer, - uint32_t infoCount, - const VkAccelerationStructureBuildGeometryInfoKHR* pInfos, - const VkDeviceAddress* pIndirectDeviceAddresses, - const uint32_t* pIndirectStrides, - const uint32_t* const* ppMaxPrimitiveCounts) -{ - unreachable("Unimplemented"); -} - -void -anv_CmdCopyAccelerationStructureKHR( - VkCommandBuffer commandBuffer, - const VkCopyAccelerationStructureInfoKHR* pInfo) -{ - unreachable("Unimplemented"); -} - -void -anv_CmdCopyAccelerationStructureToMemoryKHR( - VkCommandBuffer commandBuffer, - const VkCopyAccelerationStructureToMemoryInfoKHR* pInfo) -{ - unreachable("Unimplemented"); -} - -void -anv_CmdCopyMemoryToAccelerationStructureKHR( - VkCommandBuffer commandBuffer, - const VkCopyMemoryToAccelerationStructureInfoKHR* pInfo) -{ - unreachable("Unimplemented"); -} - -void -anv_CmdWriteAccelerationStructuresPropertiesKHR( - VkCommandBuffer commandBuffer, - uint32_t accelerationStructureCount, - const VkAccelerationStructureKHR* pAccelerationStructures, - VkQueryType queryType, - VkQueryPool queryPool, - uint32_t firstQuery) -{ - unreachable("Unimplemented"); -} diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build index b23401156e6..4ef7cc7bd43 100644 --- a/src/intel/vulkan/meson.build +++ b/src/intel/vulkan/meson.build @@ -143,7 +143,6 @@ endforeach libanv_files = files( 'layers/anv_hitman3.c', - 'anv_acceleration_structure.c', 'anv_allocator.c', 'anv_android.h', 'anv_batch_chain.c',
