piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 05:09:34 -06:00
Code Issues Packages Projects Releases Wiki Activity

have separate variables/functions for VS/PS ubo stuff, array was confusing.

Browse Source
This commit is contained in:
Jordan Woyak
2011-12-11 04:11:57 -06:00
committed by Sonicadvance1
parent a809feae1a
commit 73a29bf6a1
4 changed files with 47 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
View File

@ -240,14 +240,11 @@ void SetVSConstant4fvByName(const char * name, unsigned int offset, const float
}
void SetGLSLVSConstant4f(unsigned int const_number, float f1, float f2, float f3, float f4)
{
float buf[4];
buf[0] = f1;
buf[1] = f2;
buf[2] = f3;
buf[3] = f4;
float const buf[4] = {f1, f2, f3, f4};
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{
ProgramShaderCache::SetUniformObjects(1, const_number, buf);
ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, 1);
return;
}
for( unsigned int a = 0; a < 9; ++a)
@ -265,7 +262,7 @@ void SetGLSLVSConstant4fv(unsigned int const_number, const float *f)
{
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{
ProgramShaderCache::SetUniformObjects(1, const_number, f);
ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, 1);
return;
}
for( unsigned int a = 0; a < 9; ++a)
@ -283,7 +280,7 @@ void SetMultiGLSLVSConstant4fv(unsigned int const_number, unsigned int count, co
{
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{
ProgramShaderCache::SetUniformObjects(1, const_number, f, count);
ProgramShaderCache::SetMultiVSConstant4fv(const_number, f, count);
return;
}
for( unsigned int a = 0; a < 9; ++a)
@ -309,7 +306,7 @@ void SetMultiGLSLVSConstant3fv(unsigned int const_number, unsigned int count, co
}
if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
{
ProgramShaderCache::SetUniformObjects(1, const_number, buf, count);
ProgramShaderCache::SetMultiVSConstant4fv(const_number, buf, count);
return;
}
for( unsigned int a = 0; a < 9; ++a)