zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2024-12-13 22:20:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- block user overrides for the logic module of core fragment shaders.

Browse source
This commit is contained in:
Christoph Oelckers 2021-08-24 10:24:23 +02:00
parent dfd51ec6d5
commit 03c8fd9956
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/common/rendering/gl/gl_shader.cpp
View file

@ -404,7 +404,8 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
if (*proc_prog_lump != '#') if (*proc_prog_lump != '#')
{ {
int pp_lump = fileSystem.CheckNumForFullName(proc_prog_lump); int pp_lump = fileSystem.CheckNumForFullName(proc_prog_lump, 0); // if it's a core shader, ignore overrides by user mods.
if (pp_lump == -1) pp_lump = fileSystem.CheckNumForFullName(proc_prog_lump);
if (pp_lump == -1) I_Error("Unable to load '%s'", proc_prog_lump); if (pp_lump == -1) I_Error("Unable to load '%s'", proc_prog_lump);
FileData pp_data = fileSystem.ReadFile(pp_lump); FileData pp_data = fileSystem.ReadFile(pp_lump);

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

@ -386,7 +386,8 @@ FString VkShaderManager::GetTargetGlslVersion()
FString VkShaderManager::LoadPublicShaderLump(const char *lumpname) FString VkShaderManager::LoadPublicShaderLump(const char *lumpname)
{ {
int lump = fileSystem.CheckNumForFullName(lumpname); int lump = fileSystem.CheckNumForFullName(lumpname, 0);
if (lump == -1) lump = fileSystem.CheckNumForFullName(lumpname);
if (lump == -1) I_Error("Unable to load '%s'", lumpname); if (lump == -1) I_Error("Unable to load '%s'", lumpname);
FileData data = fileSystem.ReadFile(lump); FileData data = fileSystem.ReadFile(lump);
return data.GetString(); return data.GetString();