From aba2731f0427a04a119a59567e6715ba4034920a Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 8 Jul 2021 13:55:21 -0700 Subject: Allow render-test to run inline ray tracing tests. (#1903) * Update VS projects to 2019. * Empty commit to trigger build * Implement gfx inline ray tracing on D3D12. * Allow render-test to run inline ray tracing tests. Co-authored-by: Yong He --- tools/gfx/vulkan/render-vk.cpp | 1 + tools/gfx/vulkan/vk-util.cpp | 3 +++ 2 files changed, 4 insertions(+) (limited to 'tools/gfx/vulkan') diff --git a/tools/gfx/vulkan/render-vk.cpp b/tools/gfx/vulkan/render-vk.cpp index 90bd49868..0e3640d1f 100644 --- a/tools/gfx/vulkan/render-vk.cpp +++ b/tools/gfx/vulkan/render-vk.cpp @@ -5552,6 +5552,7 @@ Result VKDevice::initVulkanInstanceAndDevice(bool useValidationLayer) deviceCreateInfo.pNext = &rayQueryFeatures; deviceExtensions.add(VK_KHR_RAY_QUERY_EXTENSION_NAME); m_features.add("ray-query"); + m_features.add("ray-tracing"); } if (bufferDeviceAddressFeatures.bufferDeviceAddress) diff --git a/tools/gfx/vulkan/vk-util.cpp b/tools/gfx/vulkan/vk-util.cpp index c138254c0..56664d9e4 100644 --- a/tools/gfx/vulkan/vk-util.cpp +++ b/tools/gfx/vulkan/vk-util.cpp @@ -262,6 +262,9 @@ Result AccelerationStructureBuildGeometryInfoBuilder::build( case Format::R_UInt16: vkGeomData.triangles.indexType = VK_INDEX_TYPE_UINT16; break; + case Format::Unknown: + vkGeomData.triangles.indexType = VK_INDEX_TYPE_NONE_KHR; + break; default: debugCallback->handleMessage( DebugMessageType::Error, -- cgit v1.2.3