OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/coelckers/gzdoom into lightmaps2

Browse source 
# Conflicts:
#	src/common/rendering/gl/gl_shader.cpp
#	src/common/rendering/hwrenderer/data/buffers.h
#	src/common/rendering/v_video.h
This commit is contained in:
nashmuhandes 2022-01-16 01:57:38 +08:00
commit 57112742fe
298 changed files with 7614 additions and 3373 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -337,7 +337,7 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
#endif
)";
#ifdef __APPLE__
// The noise functions are completely broken in macOS OpenGL drivers
@ -621,7 +621,7 @@ bool FShader::Load(const char * name, const char * vert_prog_lump, const char *
{
char stringbuf[20];
mysnprintf(stringbuf, 20, "texture%d", i);
int tempindex = glGetUniformLocation(hShader, stringbuf);
tempindex = glGetUniformLocation(hShader, stringbuf);
if (tempindex != -1) glUniform1i(tempindex, i - 1);
}
@ -787,8 +787,8 @@ void FShaderCollection::CompileShaders(EPassType passType)
mMaterialShaders.Push(shc);
if (i < SHADER_NoTexture)
{
FShader *shc = Compile(defaultshaders[i].ShaderName, defaultshaders[i].gettexelfunc, defaultshaders[i].lightfunc, defaultshaders[i].Defines, false, passType);
mMaterialShadersNAT.Push(shc);
FShader *shc1 = Compile(defaultshaders[i].ShaderName, defaultshaders[i].gettexelfunc, defaultshaders[i].lightfunc, defaultshaders[i].Defines, false, passType);
mMaterialShadersNAT.Push(shc1);
}
}