From 508c39242878892fb59cad23b56e8c4593258433 Mon Sep 17 00:00:00 2001 From: Gael Cathelin Date: Wed, 22 Jan 2025 15:51:17 +0100 Subject: [PATCH 1/3] [Validation] fix vertex format check --- src/validation/validation-commandlist.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/validation/validation-commandlist.cpp b/src/validation/validation-commandlist.cpp index dc89be2..3bd4fee 100644 --- a/src/validation/validation-commandlist.cpp +++ b/src/validation/validation-commandlist.cpp @@ -1263,6 +1263,7 @@ namespace nvrhi::validation { case Format::RG32_FLOAT: case Format::RGB32_FLOAT: + case Format::RGBA32_FLOAT: case Format::RG16_FLOAT: case Format::RGBA16_FLOAT: case Format::RG16_SNORM: @@ -1278,7 +1279,7 @@ namespace nvrhi::validation default: { std::stringstream ss; ss << "BLAS " << utils::DebugNameToString(as->getDesc().debugName) << " build geometry " << i - << " has unsupported vertex format: " << utils::FormatToString(triangles.indexFormat); + << " has unsupported vertex format: " << utils::FormatToString(triangles.vertexFormat); error(ss.str()); return; } From 7fff734632a408e2ea6e7f36fa0ef165140988c0 Mon Sep 17 00:00:00 2001 From: Gael Cathelin Date: Fri, 10 Jan 2025 10:22:44 +0100 Subject: [PATCH 2/3] Fix AllGraphics mask typo --- include/nvrhi/nvrhi.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/nvrhi/nvrhi.h b/include/nvrhi/nvrhi.h index 8fd9214..bc4cf1a 100644 --- a/include/nvrhi/nvrhi.h +++ b/include/nvrhi/nvrhi.h @@ -757,7 +757,7 @@ namespace nvrhi Pixel = 0x0010, Amplification = 0x0040, Mesh = 0x0080, - AllGraphics = 0x00FE, + AllGraphics = 0x00DF, RayGeneration = 0x0100, AnyHit = 0x0200, From 30fa13c4ac9871af049535cff6c6e1c28d8425c9 Mon Sep 17 00:00:00 2001 From: Gael Cathelin Date: Wed, 22 Jan 2025 15:52:27 +0100 Subject: [PATCH 3/3] Fix GCC warnings --- src/vulkan/vulkan-device.cpp | 2 +- src/vulkan/vulkan-queue.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/vulkan/vulkan-device.cpp b/src/vulkan/vulkan-device.cpp index eb20188..8973929 100644 --- a/src/vulkan/vulkan-device.cpp +++ b/src/vulkan/vulkan-device.cpp @@ -283,7 +283,7 @@ namespace nvrhi::vulkan try { m_Context.device.waitIdle(); } - catch (vk::DeviceLostError e) + catch (vk::DeviceLostError &e) { return false; } diff --git a/src/vulkan/vulkan-queue.cpp b/src/vulkan/vulkan-queue.cpp index ebd5552..9a1a9fa 100644 --- a/src/vulkan/vulkan-queue.cpp +++ b/src/vulkan/vulkan-queue.cpp @@ -170,7 +170,7 @@ namespace nvrhi::vulkan try { m_Queue.submit(submitInfo); } - catch (vk::DeviceLostError e) + catch (vk::DeviceLostError &e) { m_Context.messageCallback->message(MessageSeverity::Error, "Device Removed!"); }