From 80b47cafb4dbdc18387aeab737602c2d08807c1a Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 18 Nov 2017 14:35:45 +0200 Subject: [PATCH 1/3] Fixed detection of the first entry from internal IWADINFO https://forum.zdoom.org/viewtopic.php?t=58333 --- src/d_iwad.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/d_iwad.cpp b/src/d_iwad.cpp index f10d48fb7..fadb9e65b 100644 --- a/src/d_iwad.cpp +++ b/src/d_iwad.cpp @@ -583,7 +583,7 @@ int FIWadManager::IdentifyVersion (TArray &wadfiles, const char *iwad, // We have a -iwad parameter. Pick the first usable IWAD we found through that. for (unsigned i = numFoundWads; i < mFoundWads.Size(); i++) { - if (mFoundWads[i].mInfoIndex > 0) + if (mFoundWads[i].mInfoIndex >= 0) { picks.Push(mFoundWads[i]); break; From c2b4efbea03cc70887e6493d66b816d89d998919 Mon Sep 17 00:00:00 2001 From: "alexey.lysiuk" Date: Sat, 18 Nov 2017 17:07:42 +0200 Subject: [PATCH 2/3] Fixed applying of brightmaps to overridden textures https://forum.zdoom.org/viewtopic.php?t=58444 --- src/gl/textures/gl_texture.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gl/textures/gl_texture.cpp b/src/gl/textures/gl_texture.cpp index e5a91fe14..51425d40d 100644 --- a/src/gl/textures/gl_texture.cpp +++ b/src/gl/textures/gl_texture.cpp @@ -564,7 +564,7 @@ void gl_ParseBrightmap(FScanner &sc, int deflump) else sc.UnGet(); sc.MustGetString(); - FTextureID no = TexMan.CheckForTexture(sc.String, type); + FTextureID no = TexMan.CheckForTexture(sc.String, type, FTextureManager::TEXMAN_TryAny | FTextureManager::TEXMAN_Overridable); FTexture *tex = TexMan[no]; sc.MustGetToken('{'); From 2c24d2e047772e8becd344b9152abaaac8c39da3 Mon Sep 17 00:00:00 2001 From: Rachael Alexanderson Date: Sun, 19 Nov 2017 04:40:16 -0500 Subject: [PATCH 3/3] - fixed: Made shader targets not case sensitive --- src/gl/renderer/gl_renderstate.cpp | 9 ++++++++- src/gl/shaders/gl_shader.cpp | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/gl/renderer/gl_renderstate.cpp b/src/gl/renderer/gl_renderstate.cpp index 67c9c21fa..887de5276 100644 --- a/src/gl/renderer/gl_renderstate.cpp +++ b/src/gl/renderer/gl_renderstate.cpp @@ -143,6 +143,12 @@ bool FRenderState::ApplyShader() } } + if (!activeShader) + { + assert(0); // We should not be getting to this point! + return false; + } + glVertexAttrib4fv(VATTR_COLOR, mColor.vec); glVertexAttrib4fv(VATTR_NORMAL, mNormal.vec); //activeShader->muObjectColor2.Set(mObjectColor2); @@ -367,7 +373,8 @@ void FRenderState::ApplyLightIndex(int index) { index = GLRenderer->mLights->BindUBO(index); } - activeShader->muLightIndex.Set(index); + if (activeShader) + activeShader->muLightIndex.Set(index); } } diff --git a/src/gl/shaders/gl_shader.cpp b/src/gl/shaders/gl_shader.cpp index 41b6c18a1..6c9ee416d 100644 --- a/src/gl/shaders/gl_shader.cpp +++ b/src/gl/shaders/gl_shader.cpp @@ -682,6 +682,7 @@ void gl_ParseHardwareShader(FScanner &sc, int deflump) PostProcessShader shaderdesc; shaderdesc.Target = sc.String; + shaderdesc.Target.ToLower(); bool validTarget = false; if (sc.Compare("beforebloom")) validTarget = true;