From 4ff328e074867cfded912c12ca95b46df1a4ae3e Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 23 Jan 2025 13:22:38 +0100 Subject: [PATCH] Should have launched the app before committing the previous commit :) --- src/common/rendering/vulkan/shaders/vk_shader.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/common/rendering/vulkan/shaders/vk_shader.cpp b/src/common/rendering/vulkan/shaders/vk_shader.cpp index e0fea8f95..0e8a58043 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -448,7 +448,8 @@ std::unique_ptr VkShaderManager::LoadVertShader(FString shadername .DebugName(shadername.GetChars()) .AddSource("VersionBlock", GetVersionBlock().GetChars()) .AddSource("DefinesBlock", definesBlock.GetChars()) - .AddSource("shaders/scene/layout_shared.glsl", layoutBlock.GetChars()) + .AddSource("LayoutBlock", layoutBlock.GetChars()) + .AddSource("shaders/scene/layout_shared.glsl", LoadPrivateShaderLump("shaders/scene/layout_shared.glsl").GetChars()) .AddSource(vert_lump_custom ? vert_lump_custom : vert_lump, codeBlock.GetChars()) .OnIncludeLocal([=](std::string headerName, std::string includerName, size_t depth) { return OnInclude(headerName.c_str(), includerName.c_str(), depth, false); }) .OnIncludeSystem([=](std::string headerName, std::string includerName, size_t depth) { return OnInclude(headerName.c_str(), includerName.c_str(), depth, true); }) @@ -547,7 +548,7 @@ std::unique_ptr VkShaderManager::LoadFragShader(FString shadername .AddSource("VersionBlock", GetVersionBlock().GetChars()) .AddSource("DefinesBlock", definesBlock.GetChars()) .AddSource("LayoutBlock", layoutBlock.GetChars()) - .AddSource("shaders/scene/layout_shared.glsl", layoutBlock.GetChars()) + .AddSource("shaders/scene/layout_shared.glsl", LoadPrivateShaderLump("shaders/scene/layout_shared.glsl").GetChars()) .AddSource("shaders/scene/includes.glsl", LoadPrivateShaderLump("shaders/scene/includes.glsl").GetChars()) .AddSource(mateffectname.GetChars(), mateffectBlock.GetChars()) .AddSource(materialname.GetChars(), materialBlock.GetChars())