diff options
| author | degasus <wickmarkus@web.de> | 2013-02-13 13:12:19 +0100 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2013-02-13 13:12:19 +0100 |
| commit | bbc292c21000ee3532c1fb4e955dc03951a6e2f6 (patch) | |
| tree | cca6d4faae744494b38962eaabbf0879eb154928 /Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | |
| parent | 818a376bd4f13a8913c4d8726e2e5a6701beeee8 (diff) | |
merge Vertex and PixelShaderCache into ProgramShaderCache
this is the first step, uniform handling is still missing
Diffstat (limited to 'Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp index 531af03aa2..c69932a355 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp +++ b/Source/Plugins/Plugin_VideoOGL/Src/PostProcessing.cpp @@ -20,7 +20,7 @@ #include "VideoConfig.h" #include "GLUtil.h" #include "PostProcessing.h" -#include "PixelShaderCache.h" +#include "ProgramShaderCache.h" namespace OGL { @@ -29,7 +29,7 @@ namespace PostProcessing { static std::string s_currentShader; -static FRAGMENTSHADER s_shader; +static SHADER s_shader; void Init() { @@ -63,10 +63,10 @@ bool ApplyShader() std::string code; if (File::ReadFileToString(true, s_currentShader.c_str(), code)) { - if (!PixelShaderCache::CompilePixelShader(s_shader, code.c_str())) - { - ERROR_LOG(VIDEO, "Failed to compile post-processing shader %s", s_currentShader.c_str()); - } + //if (!ProgramShaderCache::CompileShader(s_shader, "#version130\n...", code.c_str())) + //{ + // ERROR_LOG(VIDEO, "Failed to compile post-processing shader %s", s_currentShader.c_str()); + //} } else { @@ -78,7 +78,7 @@ bool ApplyShader() // TODO: Convert PP shaders to GLSL if (s_shader.glprogid != 0) { - // SetBothShaders(s_shader, 0); + s_shader.Bind(); return true; } else |