From 10e0fee323e6277ba73ee1fc148417882bc381c3 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Mon, 26 Aug 2024 13:55:32 +0100
Subject: Add helper to test if a uniform was found

---
 gfx/gl/program.h          | 6 ++++++
 gfx/gl/sceneShader.cpp    | 2 +-
 gfx/gl/shadowMapper.cpp   | 4 +++-
 gfx/gl/shadowStenciller.h | 2 +-
 4 files changed, 11 insertions(+), 3 deletions(-)

(limited to 'gfx/gl')

diff --git a/gfx/gl/program.h b/gfx/gl/program.h
index c89a128..20be1aa 100644
--- a/gfx/gl/program.h
+++ b/gfx/gl/program.h
@@ -33,6 +33,12 @@ public:
 			return location;
 		}
 
+		explicit
+		operator bool() const
+		{
+			return location >= 0;
+		}
+
 	protected:
 		GLint location;
 	};
diff --git a/gfx/gl/sceneShader.cpp b/gfx/gl/sceneShader.cpp
index 4cbccb3..571538a 100644
--- a/gfx/gl/sceneShader.cpp
+++ b/gfx/gl/sceneShader.cpp
@@ -65,7 +65,7 @@ SceneShader::SceneProgram::setViewProjection(const GlobalPosition3D & viewPoint,
 void
 SceneShader::SceneProgram::setViewPort(const ViewPort & viewPort) const
 {
-	if (viewPortLoc >= 0) {
+	if (viewPortLoc) {
 		glUseProgram(*this);
 		glUniform(viewPortLoc, viewPort);
 	}
diff --git a/gfx/gl/shadowMapper.cpp b/gfx/gl/shadowMapper.cpp
index 55167e5..177bd22 100644
--- a/gfx/gl/shadowMapper.cpp
+++ b/gfx/gl/shadowMapper.cpp
@@ -139,7 +139,9 @@ ShadowMapper::ShadowProgram::setView(const std::span<const glm::mat4x4> viewProj
 	use();
 	glUniform(viewPointLoc, viewPoint);
 	glUniform(viewProjectionLoc, viewProjection);
-	glUniform(sizesLoc, sizes);
+	if (sizesLoc) {
+		glUniform(sizesLoc, sizes);
+	}
 	glUniform(viewProjectionsLoc, static_cast<GLint>(viewProjection.size()));
 }
 
diff --git a/gfx/gl/shadowStenciller.h b/gfx/gl/shadowStenciller.h
index 009285c..925f82a 100644
--- a/gfx/gl/shadowStenciller.h
+++ b/gfx/gl/shadowStenciller.h
@@ -17,7 +17,7 @@ public:
 private:
 	glFrameBuffer fbo;
 	Program shadowCaster;
-	Program::UniformLocation viewProjectionLoc {shadowCaster, "viewProjection"};
+	Program::RequiredUniformLocation viewProjectionLoc {shadowCaster, "viewProjection"};
 
 	glm::mat4 lightDirMat {};
 };
-- 
cgit v1.2.3