From 17bb7a08ebab15c45d272457b7ec6665a8ea4ce0 Mon Sep 17 00:00:00 2001 From: Brandon Mak Date: Sat, 4 Mar 2023 01:01:26 +0800 Subject: [PATCH] Fixed render to swapchain errors --- Assets/Shaders/ToSwapchain_FS.glsl | 2 +- Assets/Shaders/ToSwapchain_FS.shshaderb | Bin 881 -> 881 bytes .../src/Graphics/RenderGraph/SHRenderGraph.cpp | 6 +++--- .../SHRenderToSwapchainImageSystem.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/Shaders/ToSwapchain_FS.glsl b/Assets/Shaders/ToSwapchain_FS.glsl index d353c15f..3cf1752f 100644 --- a/Assets/Shaders/ToSwapchain_FS.glsl +++ b/Assets/Shaders/ToSwapchain_FS.glsl @@ -3,7 +3,7 @@ #extension GL_ARB_shading_language_420pack : enable #extension GL_EXT_nonuniform_qualifier : require -layout (input_attachment_index = 0, set = 3, binding = 0) uniform subpassInput sceneTexture; +layout (input_attachment_index = 0, set = 0, binding = 0) uniform subpassInput sceneTexture; layout(location = 0) out vec4 fragColor; diff --git a/Assets/Shaders/ToSwapchain_FS.shshaderb b/Assets/Shaders/ToSwapchain_FS.shshaderb index 24cb54feb17daf6424b28de97ba12ec39b15e21d..0bee0ac67036b416f1ad7249d12b6e7ea411b98d 100644 GIT binary patch delta 14 Vcmey!_K|HvCnF=n<}SwPi~uZA1yBG0 delta 14 Vcmey!_K|HvCnF>C<}SwPi~uZS1ycY3 diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp index ea650274..e4e6889c 100644 --- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp +++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderGraph.cpp @@ -512,9 +512,9 @@ namespace SHADE uint32_t h = static_cast(resource->GetHeight()); cmdBuffer->SetViewportScissor(static_cast(w), static_cast(h), w, h); - //static constexpr uint32_t INPUT_IMAGE_SET_INDEX = 0; - auto const& mappings = SHGraphicsPredefinedData::GetMappings(SHGraphicsPredefinedData::SystemType::BATCHING); - newSubpass->BindInputDescriptorSets (cmdBuffer, mappings.at(SHPredefinedDescriptorTypes::RENDER_GRAPH_RESOURCE), frameIndex); + static constexpr uint32_t INPUT_IMAGE_SET_INDEX = 0; + //auto const& mappings = SHGraphicsPredefinedData::GetMappings(SHGraphicsPredefinedData::SystemType::BATCHING); + newSubpass->BindInputDescriptorSets (cmdBuffer, INPUT_IMAGE_SET_INDEX, frameIndex); // draw a quad. cmdBuffer->DrawArrays(4, 1, 0, 0); diff --git a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp index 80260b7b..cffc3aa8 100644 --- a/SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp +++ b/SHADE_Engine/src/Graphics/RenderGraph/SHRenderToSwapchainImageSystem.cpp @@ -21,7 +21,7 @@ namespace SHADE void SHRenderToSwapchainImageSystem::ConstructPipelines(Handle logicalDevice) noexcept { - auto pipelineLayout = logicalDevice->CreatePipelineLayout(SHPipelineLayoutParams + pipelineLayout = logicalDevice->CreatePipelineLayout(SHPipelineLayoutParams { .shaderModules = {shaderModules.first, shaderModules.second}, .predefinedDescSetLayouts = {}