summaryrefslogtreecommitdiff
path: root/Source
diff options
context:
space:
mode:
authorRyan Houdek <Sonicadvance1@gmail.com>2011-12-11 05:15:08 -0600
committerSonicadvance1 <sonicadvance1@RH-Live.(none)>2012-10-09 23:41:48 -0500
commit04836705b70bacaeebc4a4ae07ae050b764836a4 (patch)
treeb3878514a9b169719779929dbe39f8582efe194e /Source
parent8e80771670625fbb72c683f061965b8b12dc07bf (diff)
Show a bit of information when using GLSL shaders.
Diffstat (limited to 'Source')
-rw-r--r--Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index e30344edcb..b1d4e4b701 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -31,6 +31,8 @@
#include "ProgramShaderCache.h"
#include "PixelShaderCache.h"
#include "PixelShaderManager.h"
+#include "OnScreenDisplay.h"
+#include "StringUtil.h"
#include "FileUtil.h"
#include "Debugger.h"
@@ -74,25 +76,28 @@ void PixelShaderCache::Init()
if(g_ActiveConfig.bUseGLSL)
{
- pSetPSConstant4f = SetGLSLPSConstant4f;
- pSetPSConstant4fv = SetGLSLPSConstant4fv;
- pSetMultiPSConstant4fv = SetMultiGLSLPSConstant4fv;
- pCompilePixelShader = CompileGLSLPixelShader;
- // Should this be set here?
- if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_shading_language_420pack") != NULL)
+ pSetPSConstant4f = SetGLSLPSConstant4f;
+ pSetPSConstant4fv = SetGLSLPSConstant4fv;
+ pSetMultiPSConstant4fv = SetMultiGLSLPSConstant4fv;
+ pCompilePixelShader = CompileGLSLPixelShader;
+ // Should this be set here?
+ if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_shading_language_420pack") != NULL)
g_Config.backend_info.bSupportsGLSLBinding = true;
if (strstr((const char*)glGetString(GL_EXTENSIONS), "GL_ARB_uniform_buffer_object") != NULL)
g_Config.backend_info.bSupportsGLSLUBO = true;
UpdateActiveConfig();
+ OSD::AddMessage(StringFromFormat("Using GLSL. Supports Binding: %s UBOs: %s",
+ g_ActiveConfig.backend_info.bSupportsGLSLBinding ? "True" : "False",
+ g_ActiveConfig.backend_info.bSupportsGLSLUBO ? "True" : "False").c_str(), 5000);
}
else
{
- pSetPSConstant4f = SetCGPSConstant4f;
- pSetPSConstant4fv = SetCGPSConstant4fv;
- pSetMultiPSConstant4fv = SetMultiCGPSConstant4fv;
- pCompilePixelShader = CompileCGPixelShader;
- glEnable(GL_FRAGMENT_PROGRAM_ARB);
+ pSetPSConstant4f = SetCGPSConstant4f;
+ pSetPSConstant4fv = SetCGPSConstant4fv;
+ pSetMultiPSConstant4fv = SetMultiCGPSConstant4fv;
+ pCompilePixelShader = CompileCGPixelShader;
+ glEnable(GL_FRAGMENT_PROGRAM_ARB);
}
glGetProgramivARB(GL_FRAGMENT_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB, (GLint *)&s_nMaxPixelInstructions);