From e8e713253eebec0363a21773093ab3957ed72b55 Mon Sep 17 00:00:00 2001 From: antopilo Date: Tue, 29 Apr 2025 22:30:56 -0400 Subject: [PATCH] Fixed compilation errors --- Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.cpp | 2 +- Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.h | 5 ++--- Nuake/Source/Nuake/Rendering/Vulkan/SceneRenderPipeline.cpp | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.cpp b/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.cpp index 3e4f903e..fc63ac91 100644 --- a/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.cpp +++ b/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.cpp @@ -119,7 +119,7 @@ BindlessDescriptor::BindlessDescriptor(ResourceType type, BindlessInfo& info) { const size_t offset = i * size; uint8_t* partitionStart = static_cast(mappedData) + offset; - Descriptors.emplace_back(Descriptor(Buffer, DescriptorLayout, partitionStart, offset, size)); + Descriptors.emplace_back(Buffer, DescriptorLayout, partitionStart, offset, size, info); } } diff --git a/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.h b/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.h index 4ca36379..da4044f0 100644 --- a/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.h +++ b/Nuake/Source/Nuake/Rendering/Vulkan/BindlessDescriptor.h @@ -54,8 +54,7 @@ namespace Nuake ~Descriptor() = default; int32_t LoadResource(const UUID& id); - int32_t GetResourceSlot(const UUID& id); - + int32_t GetResourceSlot(const UUID& id) const; }; // Contains buffer for N frames of a resource type @@ -98,7 +97,7 @@ namespace Nuake { Info.ResourceElementSize[T] = sizeof(S); Info.ResourceCount[T] = size; - Descriptors[T] = BindlessDescriptor(T, (size_t)sizeof(S) * size); + //Descriptors[T] = BindlessDescriptor(T, Info); } }; } \ No newline at end of file diff --git a/Nuake/Source/Nuake/Rendering/Vulkan/SceneRenderPipeline.cpp b/Nuake/Source/Nuake/Rendering/Vulkan/SceneRenderPipeline.cpp index 89013c21..5fa3f757 100644 --- a/Nuake/Source/Nuake/Rendering/Vulkan/SceneRenderPipeline.cpp +++ b/Nuake/Source/Nuake/Rendering/Vulkan/SceneRenderPipeline.cpp @@ -34,7 +34,7 @@ ShadowRenderPipeline::ShadowRenderPipeline() shadowPass.SetShaders(shaderMgr.GetShader("shadow_vert"), shaderMgr.GetShader("shadow_frag")); shadowPass.SetPushConstant(gbufferConstant); shadowPass.SetPreRender([&](PassRenderContext& ctx) { - auto& layout = ctx.renderPass->PipelineLayout; + auto& layout = ctx.renderPass->PipelineLayout; auto& res = GPUResources::Get(); Cmd& cmd = ctx.commandBuffer;