From 437761843850ce32974fd4729d7b8d7d0405a04f Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 7 Oct 2013 16:02:24 +0200 Subject: 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. --- .../VideoBackends/OGL/Src/PixelShaderCache.cpp | 72 +++------------------- 1 file changed, 7 insertions(+), 65 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp') 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 -- cgit v1.2.3 From 7c14463d11f816b1dd0cd2efd9bbe018f4d64a4a Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 7 Oct 2013 17:19:47 +0200 Subject: ogl: implement useful constant buffer upload this will remove the additional memcpy introduced in my last commit --- Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp') diff --git a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp index 0635003dfd..ba6a0b2e97 100644 --- a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp @@ -27,20 +27,5 @@ namespace OGL // Renderer functions 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; - } - - ProgramShaderCache::PCacheEntry tmp = ProgramShaderCache::GetShaderProgram(); - for (unsigned int a = 0; a < 10; ++a) - { - 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 -- cgit v1.2.3 From 6e2fe72b8fe0bfd13171b43bcbff40b20d15737e Mon Sep 17 00:00:00 2001 From: degasus Date: Mon, 7 Oct 2013 17:52:22 +0200 Subject: D3D: also uses VideoCommon constant buffer handling As now both backends uses the VideoCommon one, the old setting API was removed. --- .../VideoBackends/OGL/Src/PixelShaderCache.cpp | 31 ---------------------- 1 file changed, 31 deletions(-) delete mode 100644 Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp (limited to 'Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp') diff --git a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp b/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp deleted file mode 100644 index ba6a0b2e97..0000000000 --- a/Source/Core/VideoBackends/OGL/Src/PixelShaderCache.cpp +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright 2013 Dolphin Emulator Project -// Licensed under GPLv2 -// Refer to the license.txt file included. - -#include "Globals.h" - -#include "GLUtil.h" - -#include - -#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 -{ - -// Renderer functions -void Renderer::SetMultiPSConstant4fv(unsigned int const_number, unsigned int count, const float *f) -{ -} -} // namespace OGL -- cgit v1.2.3