Minor code cleanup

--HG--
branch : minor

src/modules/graphics/Shader.h

@@ -29,6 +29,7 @@
 #include <string>
 #include <map>
 #include <vector>
+#include <stddef.h>
 
 namespace love
 {
@@ -150,6 +151,11 @@ public:
 	 **/
 	virtual bool hasUniform(const std::string &name) const = 0;
 
+	/**
+	 * Sets the textures used when rendering a video. For internal use only.
+	 **/
+	virtual void setVideoTextures(ptrdiff_t ytexture, ptrdiff_t cbtexture, ptrdiff_t crtexture) = 0;
+
 	static bool getConstant(const char *in, ShaderStage &out);
 	static bool getConstant(ShaderStage in, const char *&out);
 

src/modules/graphics/opengl/Shader.cpp

@@ -36,38 +36,6 @@ namespace graphics
 namespace opengl
 {
 
-namespace
-{
-	// temporarily attaches a shader program (for setting uniforms, etc)
-	// reattaches the originally active program when destroyed
-	struct TemporaryAttacher
-	{
-		TemporaryAttacher(graphics::Shader *shader, bool attachNow)
-		: curShader(shader)
-		, prevShader(Shader::current)
-		{
-			if (attachNow)
-				attach();
-		}
-
-		~TemporaryAttacher()
-		{
-			if (prevShader != nullptr)
-				prevShader->attach();
-			else
-				Shader::attachDefault();
-		}
-
-		void attach()
-		{
-			curShader->attach(true);
-		}
-
-		graphics::Shader *curShader;
-		graphics::Shader *prevShader;
-	};
-} // anonymous namespace
-
 Shader::Shader(const ShaderSource &source)
 	: shaderSource(source)
 	, program(0)
@@ -749,43 +717,39 @@ GLint Shader::getAttribLocation(const std::string &name)
 	return location;
 }
 
-void Shader::setVideoTextures(GLuint ytexture, GLuint cbtexture, GLuint crtexture)
+void Shader::setVideoTextures(ptrdiff_t ytexture, ptrdiff_t cbtexture, ptrdiff_t crtexture)
 {
 	// Set up the texture units that will be used by the shader to sample from
 	// the textures, if they haven't been set up yet.
 	if (videoTextureUnits[0] == 0)
 	{
-		TemporaryAttacher attacher(this, true);
-
-		const GLint locs[3] = {
-			builtinUniforms[BUILTIN_VIDEO_Y_CHANNEL],
-			builtinUniforms[BUILTIN_VIDEO_CB_CHANNEL],
-			builtinUniforms[BUILTIN_VIDEO_CR_CHANNEL]
+		const BuiltinUniform builtins[3] = {
+			BUILTIN_VIDEO_Y_CHANNEL,
+			BUILTIN_VIDEO_CB_CHANNEL,
+			BUILTIN_VIDEO_CR_CHANNEL,
 		};
 
-		const char *names[3] = {nullptr, nullptr, nullptr};
-		getConstant(BUILTIN_VIDEO_Y_CHANNEL,  names[0]);
-		getConstant(BUILTIN_VIDEO_CB_CHANNEL, names[1]);
-		getConstant(BUILTIN_VIDEO_CR_CHANNEL, names[2]);
-
 		for (int i = 0; i < 3; i++)
 		{
-			if (locs[i] >= 0 && names[i] != nullptr)
+			GLint loc = builtinUniforms[builtins[i]];
+			const char *name = nullptr;;
+
+			if (loc >= 0 && getConstant(builtins[i], name) && name != nullptr)
 			{
-				const UniformInfo *info = getUniformInfo(names[i]);
-				if (info != nullptr)
-				{
-					videoTextureUnits[i] = getFreeTextureUnits(1);
-					textureUnits[videoTextureUnits[i]].active = true;
+				const UniformInfo *info = getUniformInfo(name);
+				if (info == nullptr)
+					continue;
 
-					info->ints[0] = videoTextureUnits[i];
-					updateUniform(info, 1);
-				}
+				videoTextureUnits[i] = getFreeTextureUnits(1);
+				textureUnits[videoTextureUnits[i]].active = true;
+
+				info->ints[0] = videoTextureUnits[i];
+				updateUniform(info, 1);
 			}
 		}
 	}
 
-	const GLuint textures[3] = {ytexture, cbtexture, crtexture};
+	const GLuint textures[3] = {(GLuint) ytexture, (GLuint) cbtexture, (GLuint) crtexture};
 
 	// Bind the textures to their respective texture units.
 	for (int i = 0; i < 3; i++)

src/modules/graphics/opengl/Shader.h

@@ -62,10 +62,10 @@ public:
 	void updateUniform(const UniformInfo *info, int count, bool internalUpdate = false) override;
 	void sendTextures(const UniformInfo *info, Texture **textures, int count, bool internalUpdate = false) override;
 	bool hasUniform(const std::string &name) const override;
+	void setVideoTextures(ptrdiff_t ytexture, ptrdiff_t cbtexture, ptrdiff_t crtexture) override;
 
 	GLint getAttribLocation(const std::string &name);
 
-	void setVideoTextures(GLuint ytexture, GLuint cbtexture, GLuint crtexture);
 	void checkSetScreenParams();
 	void checkSetPointSize(float size);
 	void checkSetBuiltinUniforms();

src/modules/graphics/opengl/Video.cpp

@@ -127,13 +127,13 @@ void Video::draw(Graphics *gfx, const Matrix4 &m)
 
 	gfx->flushStreamDraws();
 
-	Shader *shader = (Shader *) Shader::current;
+	love::graphics::Shader *shader = Shader::current;
 	bool usingdefaultshader = (shader == Shader::defaultShader);
 	if (usingdefaultshader)
 	{
 		// If we're using the default shader, substitute the video version.
 		Shader::defaultVideoShader->attach();
-		shader = (Shader *) Shader::defaultVideoShader;
+		shader = Shader::defaultVideoShader;
 	}
 
 	shader->setVideoTextures(textures[0], textures[1], textures[2]);