- fixed: Made shader targets not case sensitive

ZDoom · Nov 19, 2017 · 2c24d2e · 2c24d2e
1 parent c2b4efb
commit 2c24d2e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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;