OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fix how layout_shared is added to the shader

Browse source
This commit is contained in:
Magnus Norddahl 2025-01-23 13:19:31 +01:00
commit 02603370b5
1 changed files with 1 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/common/rendering/vulkan/shaders/vk_shader.cpp
View file

@ -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<VulkanShader> 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<VulkanShader> 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<VulkanShader> 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())