Updated Donut and the Vertex Buffer example to test a recent fix in N…

…VRHI.
NVIDIAGameWorks · Aug 4, 2023 · a3d3fe7 · a3d3fe7
1 parent cae3f3c
commit a3d3fe7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/donut b/donut
diff --git a/examples/vertex_buffer/vertex_buffer.cpp b/examples/vertex_buffer/vertex_buffer.cpp
@@ -146,12 +146,14 @@ class VertexBuffer : public app::IRenderPass
             nvrhi::VertexAttributeDesc()
                 .setName("POSITION")
                 .setFormat(nvrhi::Format::RGB32_FLOAT)
-                .setOffset(offsetof(Vertex, position))
+                .setOffset(0)
+                .setBufferIndex(0)
                 .setElementStride(sizeof(Vertex)),
             nvrhi::VertexAttributeDesc()
                 .setName("UV")
                 .setFormat(nvrhi::Format::RG32_FLOAT)
-                .setOffset(offsetof(Vertex, uv))
+                .setOffset(0)
+                .setBufferIndex(1)
                 .setElementStride(sizeof(Vertex)),
         };
         m_InputLayout = GetDevice()->createInputLayout(attributes, uint32_t(std::size(attributes)), m_VertexShader);
@@ -275,7 +277,11 @@ class VertexBuffer : public app::IRenderPass
             // Pick the right binding set for this view.
             state.bindings = { m_BindingSets[viewIndex] };
             state.indexBuffer = { m_IndexBuffer, nvrhi::Format::R32_UINT, 0 };
-            state.vertexBuffers = { { m_VertexBuffer, 0, 0 } };
+            // Bind the vertex buffers in reverse order to test the NVRHI implementation of binding slots
+            state.vertexBuffers = {
+                { m_VertexBuffer, 1, offsetof(Vertex, uv) },
+                { m_VertexBuffer, 0, offsetof(Vertex, position) }
+            };
             state.pipeline = m_Pipeline;
             state.framebuffer = framebuffer;
+0 −1		CMakeLists.txt
+1 −1		ShaderMake
+7 −4		include/donut/core/vfs/VFS.h
+1 −1		nvrhi
+1 −0		src/core/string_utils.cpp
+1 −0		src/core/vfs/TarFile.cpp
+1 −1		src/core/vfs/VFS.cpp
+1 −0		src/engine/ConsoleObjects.cpp
+13 −72		tests/src/core/test_vfs.cpp
+6 −6		tests/src/engine/test_console_objects.cpp