From ed18b82d2f9b36293f6b3ffaaeeaf958cf024144 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Wed, 7 Dec 2011 22:11:41 -0600
Subject: [PATCH] This lets us see stuff with GLSL shaders. Just need to take
 care of some compile errors now.

---
 Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp  | 2 +-
 Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 6c67252dde..b3e8b09b18 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -66,7 +66,6 @@ GLuint PixelShaderCache::GetColorMatrixProgram()
 
 void PixelShaderCache::Init()
 {
-    glEnable(GL_FRAGMENT_PROGRAM_ARB);
     ShaderEnabled = true;
     CurrentShader = 0;
     last_entry = NULL;
@@ -87,6 +86,7 @@ void PixelShaderCache::Init()
         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);
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index 34c8020a00..e51e70d9eb 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -55,7 +55,6 @@ bool (*pCompileVertexShader)(VERTEXSHADER&, const char*);
 
 void VertexShaderCache::Init()
 {
-    glEnable(GL_VERTEX_PROGRAM_ARB);
     ShaderEnabled = true;
     CurrentShader = 0;
     last_entry = NULL;
@@ -75,6 +74,7 @@ void VertexShaderCache::Init()
         pSetMultiVSConstant4fv = SetMultiCGVSConstant4fv;
         pSetMultiVSConstant3fv = SetMultiCGVSConstant3fv;
         pCompileVertexShader = CompileCGVertexShader;
+        glEnable(GL_VERTEX_PROGRAM_ARB);
     }
 
     glGetProgramivARB(GL_VERTEX_PROGRAM_ARB, GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB, (GLint *)&s_nMaxVertexInstructions);