OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'gzdoom/master' into merge-gzdoom

Browse source
This commit is contained in:
Magnus Norddahl 2023-10-19 21:05:17 +02:00
commit e75e5a387b
600 changed files with 40006 additions and 59374 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/common/rendering/hwrenderer/postprocessing/hw_postprocess.cpp
View file

@ -1016,7 +1016,7 @@ void PPCustomShaderInstance::SetTextures(PPRenderState *renderstate)
while (it.NextPair(pair))
{
FString name = pair->Value;
auto gtex = TexMan.GetGameTexture(TexMan.CheckForTexture(name, ETextureType::Any), true);
auto gtex = TexMan.GetGameTexture(TexMan.CheckForTexture(name.GetChars(), ETextureType::Any), true);
if (gtex && gtex->isValid())
{
// Why does this completely circumvent the normal way of handling textures?

6
src/common/rendering/hwrenderer/postprocessing/hw_postprocessshader_ccmds.cpp
View file

@ -39,7 +39,7 @@ CCMD (shaderenable)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
if (value != -1)
shader.Enabled = value;
@ -70,7 +70,7 @@ CCMD (shaderuniform)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
if (argv.argc() > 3)
{
@ -116,7 +116,7 @@ CCMD(listuniforms)
for (unsigned int i = 0; i < PostProcessShaders.Size(); i++)
{
PostProcessShader &shader = PostProcessShaders[i];
if (strcmp(shader.Name, shaderName) == 0)
if (shader.Name.Compare(shaderName) == 0)
{
Printf("Shader '%s' uniforms:\n", shaderName);