Merge branch 'const_buffer_rework'

1 files changed, 0 insertions, 104 deletions

diff --git a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
deleted file mode 100644
index 3fac62bd73..0000000000
--- a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2013 Dolphin Emulator Project
-// Licensed under GPLv2
-// Refer to the license.txt file included.
-
-#include "Globals.h"
-
-#include "GLUtil.h"
-
-#include <cmath>
-
-#include "Statistics.h"
-#include "VideoConfig.h"
-#include "ImageWrite.h"
-#include "Common.h"
-#include "Render.h"
-#include "VertexShaderGen.h"
-#include "ProgramShaderCache.h"
-#include "PixelShaderManager.h"
-#include "OnScreenDisplay.h"
-#include "StringUtil.h"
-#include "FileUtil.h"
-#include "Debugger.h"
-
-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)
-	{
-		ProgramShaderCache::SetMultiPSConstant4fv(const_number, f, count);
-		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, count);
-			return;
-		}
-	}
-}
-}  // namespace OGL