From 02603370b573c0a047aa0fc18f0300356839a9fa Mon Sep 17 00:00:00 2001 From: Magnus Norddahl Date: Thu, 23 Jan 2025 13:19:31 +0100 Subject: [PATCH] Fix how layout_shared is added to the shader --- src/common/rendering/vulkan/shaders/vk_shader.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/src/common/rendering/vulkan/shaders/vk_shader.cpp b/src/common/rendering/vulkan/shaders/vk_shader.cpp index 5d2387ca8..e0fea8f95 100644 --- a/src/common/rendering/vulkan/shaders/vk_shader.cpp +++ b/src/common/rendering/vulkan/shaders/vk_shader.cpp @@ -314,11 +314,6 @@ void VkShaderManager::BuildLayoutBlock(FString &layoutBlock, bool isFrag, const int index = 0; AddBuiltinFields(layoutBlock, index, false, fragShaderOutputs, key, hasClipDistance); } - - layoutBlock << "#line 1\n"; - - layoutBlock << LoadPrivateShaderLump("shaders/scene/layout_shared.glsl").GetChars() << "\n"; - } void VkShaderManager::BuildDefinesBlock(FString &definesBlock, const char *defines, bool isFrag, const VkShaderKey& key, const UserShaderDesc *shader) @@ -436,7 +431,6 @@ std::unique_ptr VkShaderManager::LoadVertShader(FString shadername FString layoutBlock; BuildLayoutBlock(layoutBlock, false, key, shader); - FString codeBlock; codeBlock << LoadPrivateShaderLump(vert_lump).GetChars() << "\n"; if(vert_lump_custom) @@ -469,7 +463,6 @@ std::unique_ptr VkShaderManager::LoadFragShader(FString shadername FString layoutBlock; BuildLayoutBlock(layoutBlock, true, key, shader); - FString codeBlock; codeBlock << LoadPrivateShaderLump(frag_lump).GetChars() << "\n"; @@ -554,6 +547,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/includes.glsl", LoadPrivateShaderLump("shaders/scene/includes.glsl").GetChars()) .AddSource(mateffectname.GetChars(), mateffectBlock.GetChars()) .AddSource(materialname.GetChars(), materialBlock.GetChars())