From d1ad4538f314a4f9dcd45c0c6a2e63d8ef89dcca Mon Sep 17 00:00:00 2001
From: Sergey Lipskiy <gonetz@ngs.ru>
Date: Tue, 10 Jan 2017 18:15:35 +0700
Subject: [PATCH] CombinerProgram cleanup

---
 src/Graphics/CombinerProgram.h | 7 ++-----
 src/OpenGL.cpp                 | 3 +--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/Graphics/CombinerProgram.h b/src/Graphics/CombinerProgram.h
index c15481a5..b45be1d6 100644
--- a/src/Graphics/CombinerProgram.h
+++ b/src/Graphics/CombinerProgram.h
@@ -11,21 +11,18 @@ namespace graphics {
 		virtual ~CombinerProgram() {}
 		virtual void activate() = 0;
 		virtual void update(bool _force) = 0;
+
 		virtual CombinerKey getKey() const = 0;
+
 		virtual bool usesTexture() const = 0;
 		virtual bool usesTile(u32 _t) const = 0;
 		virtual bool usesShade() const = 0;
 		virtual bool usesLOD() const = 0;
 
-		// TODO implement
-		void disableBlending() {}
-		void updateFrameBufferInfo(bool _bForce = false) {}
-
 		virtual bool getBinaryForm(std::vector<char> & _buffer) = 0;
 
 		static void getShaderCombinerOptionsSet(std::vector<u32> & _vecOptions);
 	};
 
 	typedef std::map<CombinerKey, graphics::CombinerProgram *> Combiners;
-
 }
diff --git a/src/OpenGL.cpp b/src/OpenGL.cpp
index 82afebfa..dbcae5cf 100644
--- a/src/OpenGL.cpp
+++ b/src/OpenGL.cpp
@@ -1146,7 +1146,6 @@ void OGLRender::_updateTextures(RENDER_STATE _renderState) const
 			else
 				textureCache().activateDummy(t);
 		}
-		pCurrentCombiner->updateFrameBufferInfo();
 	}
 	gDP.changed &= ~(CHANGED_TILE | CHANGED_TMEM);
 	gSP.changed &= ~(CHANGED_TEXTURE);
@@ -1670,7 +1669,7 @@ bool texturedRectPaletteMod(const OGLRender::TexturedRectParams & _params)
 			curTile.frameBuffer = nullptr;
 			curTile.textureMode = TEXTUREMODE_NORMAL;
 			textureCache().update(0);
-			currentCombiner()->updateFrameBufferInfo();
+			currentCombiner()->update(false);
 		}
 		return false;
 	}