ShuriZma
/
visualboyadvance-m
mirror of https://github.com/visualboyadvance-m/visualboyadvance-m.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed up OpenGL code from last round

This commit is contained in:
mudlord 2007-12-23 20:03:57 +00:00
parent 95b51abe1d
commit 0e62b0fa3f
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/win32/OpenGL.cpp
View File

@ -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;