VideoCommon: keep a copy of the const buffer in VideoCommon

The upload in the backend isn't done, it's just pushed by the mostly removed SetMulti*SConstant4fv.
Also no optimizations was done on VideoCommon side, but I can start now :-)

Sorry for the hacky way, but I think this is a nice (working) snapshot for a much bigger change.

1 files changed, 7 insertions, 65 deletions

diff --git a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
index 3fac62bd73..0635003dfd 100644
--- a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
@@ -24,66 +24,7 @@
 namespace OGL
 {
 
-void SetPSConstant4fvByName(const char * name, unsigned int offset, const float *f, const unsigned int count = 1)
-{
-	ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram();
-	for (int a = 0; a < NUM_UNIFORMS; ++a)
-	{
-		if (!strcmp(name, UniformNames[a]))
-		{
-			if (tmp.shader.UniformLocations[a] == -1)
-				return;
-			else if (tmp.shader.UniformSize[a] <= offset)
-				return;
-			else
-			{
-				unsigned int maxcount= tmp.shader.UniformSize[a]-offset;
-				glUniform4fv(tmp.shader.UniformLocations[a] + offset, std::min(count, maxcount), f);
-				return;
-			}
-		}
-	}
-}
-
 // Renderer functions
-void Renderer::SetPSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
-{
-	float const f[4] = {f1, f2, f3, f4};
-
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 10; ++a)
-	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f);
-			return;
-		}
-	}
-}
-
-void Renderer::SetPSConstant4fv(unsigned int const_number, const float *f)
-{
-	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, 1);
-		return;
-	}
-	for (unsigned int a = 0; a < 10; ++a)
-	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f);
-			return;
-		}
-	}
-}
-
 void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f)
 {
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
@@ -91,14 +32,15 @@ void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int cou
 		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, count);
 		return;
 	}
+	
+	ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram();
 	for (unsigned int a = 0; a < 10; ++a)
 	{
-		if (const_number >= PSVar_Loc[a].reg && const_number < (PSVar_Loc[a].reg + PSVar_Loc[a].size))
-		{
-			unsigned int offset = const_number - PSVar_Loc[a].reg;
-			SetPSConstant4fvByName(PSVar_Loc[a].name, offset, f, count);
-			return;
-		}
+		u32 offset = PSVar_Loc[a].reg - const_number;
+		if(offset >= count) return;
+		u32 size = std::min(tmp.shader.UniformSize[a], count-offset);
+		if(size > 0)
+			glUniform4fv(tmp.shader.UniformLocations[a], size, f + 4*offset);
 	}
 }
 }  // namespace OGL