Disabled NV-only extension, fixed buffer usages

pixelcluster · Jan 5, 2022 · 5363e80 · 5363e80
1 parent f81b40a
commit 5363e80
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/RayTracingDevice.cpp b/src/RayTracingDevice.cpp
@@ -217,7 +217,7 @@ void RayTracingDevice::init(bool enableHardwareRaytracing) {
 		deviceExtensionNames.reserve(1);
 	}
 	deviceExtensionNames.push_back(VK_KHR_SWAPCHAIN_EXTENSION_NAME);
-	deviceExtensionNames.push_back(VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME);
+	/*deviceExtensionNames.push_back(VK_NV_DEVICE_DIAGNOSTICS_CONFIG_EXTENSION_NAME);
 	deviceExtensionNames.push_back(VK_NV_DEVICE_DIAGNOSTIC_CHECKPOINTS_EXTENSION_NAME);
 
 	VkDeviceDiagnosticsConfigFlagsNV aftermathFlags =
@@ -228,10 +228,10 @@ void RayTracingDevice::init(bool enableHardwareRaytracing) {
 	VkDeviceDiagnosticsConfigCreateInfoNV aftermathInfo = {};
 	aftermathInfo.sType = VK_STRUCTURE_TYPE_DEVICE_DIAGNOSTICS_CONFIG_CREATE_INFO_NV;
 	aftermathInfo.pNext = &features;
-	aftermathInfo.flags = aftermathFlags;
+	aftermathInfo.flags = aftermathFlags;*/
 
 	VkDeviceCreateInfo deviceCreateInfo = { .sType = VK_STRUCTURE_TYPE_DEVICE_CREATE_INFO,
-											.pNext = &aftermathInfo,
+											.pNext = &features,
 											.queueCreateInfoCount = 1,
 											.pQueueCreateInfos = &deviceQueueCreateInfo,
 											.enabledLayerCount = static_cast<uint32_t>(instanceLayerNames.size()),

diff --git a/src/util/AccelerationStructureBuilder.cpp b/src/util/AccelerationStructureBuilder.cpp
@@ -267,7 +267,7 @@ AccelerationStructureBuilder::AccelerationStructureBuilder(RayTracingDevice& dev
 														 .usage = VK_BUFFER_USAGE_STORAGE_BUFFER_BIT |
 																  VK_BUFFER_USAGE_TRANSFER_DST_BIT };
 	verifyResult(vkCreateBuffer(m_device.device(), &geometryIndexBufferCreateInfo, nullptr, &m_geometryIndexBuffer));
-	geometryIndexBufferCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_DST_BIT;
+	geometryIndexBufferCreateInfo.usage = VK_BUFFER_USAGE_TRANSFER_SRC_BIT;
 	VkBuffer geometryIndexStagingBuffer;
 	verifyResult(vkCreateBuffer(m_device.device(), &geometryIndexBufferCreateInfo, nullptr, &geometryIndexStagingBuffer));