From 6418ed33b007f066d26128ff5a57387ce1df8dc3 Mon Sep 17 00:00:00 2001
From: mudlord <mudlord@a31d4220-a93d-0410-bf67-fe4944624d44>
Date: Sun, 23 Dec 2007 20:03:57 +0000
Subject: [PATCH] Fixed up OpenGL code from last round

git-svn-id: https://svn.code.sf.net/p/vbam/code/trunk@222 a31d4220-a93d-0410-bf67-fe4944624d44
---
 src/win32/OpenGL.cpp | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/win32/OpenGL.cpp b/src/win32/OpenGL.cpp
index 95bae662..5dcfbdee 100644
--- a/src/win32/OpenGL.cpp
+++ b/src/win32/OpenGL.cpp
@@ -35,7 +35,6 @@
 // OpenGL
 #include <gl/GL.h> // main include file
 #include <GL/glu.h>
-#include <GL/glaux.h>
 #ifdef HAS_GLEXT
 #include <gl/glext.h>
 #endif
@@ -56,6 +55,8 @@ PFNGLUNIFORM4FARBPROC            glUniform4fARB            = NULL;
 PFNGLUNIFORM1IARBPROC            glUniform1iARB            = NULL;
 
 
+
+
 extern int Init_2xSaI(u32);
 extern void winlog(const char *,...);
 extern int systemSpeed;
@@ -86,7 +87,6 @@ private:
 	GLFONT font;
 	int VertexShader,FragmentShader,textureLocation,ShaderProgram,g_location_grayScaleWeights;
 	char *VertexShaderSource,*FragmentShaderSource;
-    int ShaderProgram;
 
 	void initializeMatrices( int w, int h );
 	bool initializeTexture( int w, int h );
@@ -308,7 +308,6 @@ bool OpenGLDisplay::initialize()
 	glEnable( GL_TEXTURE_2D );
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	glewInit();
 	
 	initializeMatrices( theApp.surfaceSizeX, theApp.surfaceSizeY );
 
@@ -356,7 +355,7 @@ void OpenGLDisplay::render()
 	}
 	else{
 	glUseProgramObjectARB(NULL);
-	DeInitShader();
+	DeInitGLSLShader();
 	}
 	
 	int pitch = theApp.filterWidth * (systemColorDepth>>3) + 4;