MGislv/GLideN64
1
0
Fork 0
mirror of https://github.com/blawar/GLideN64.git synced 2024-07-07 03:13:49 +00:00
Code Issues Projects Releases Wiki Activity

Fix GLFunctions for EGL.

Browse Source
This commit is contained in:
Francisco Zurita 2017-01-29 21:48:12 +07:00 committed by Sergey Lipskiy
parent 184ff8f017
commit 85fc5ec31f
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Graphics/OpenGLContext/GLFunctions.cpp
View File

@ -63,6 +63,9 @@ PFNGLGETFLOATVPROC glGetFloatv;
PFNGLDELETETEXTURESPROC glDeleteTextures; PFNGLDELETETEXTURESPROC glDeleteTextures;
PFNGLGENTEXTURESPROC glGenTextures; PFNGLGENTEXTURESPROC glGenTextures;
PFNGLTEXPARAMETERFPROC glTexParameterf; PFNGLTEXPARAMETERFPROC glTexParameterf;
PFNGLACTIVETEXTUREPROC glActiveTexture;
PFNGLBLENDCOLORPROC glBlendColor;
PFNGLREADBUFFERPROC glReadBuffer;
#endif #endif
PFNGLCREATESHADERPROC glCreateShader; PFNGLCREATESHADERPROC glCreateShader;
PFNGLCOMPILESHADERPROC glCompileShader; PFNGLCOMPILESHADERPROC glCompileShader;
@ -185,6 +188,9 @@ void initGLFunctions()
GL_GET_PROC_ADR(PFNGLDELETETEXTURESPROC, glDeleteTextures); GL_GET_PROC_ADR(PFNGLDELETETEXTURESPROC, glDeleteTextures);
GL_GET_PROC_ADR(PFNGLGENTEXTURESPROC, glGenTextures); GL_GET_PROC_ADR(PFNGLGENTEXTURESPROC, glGenTextures);
GL_GET_PROC_ADR(PFNGLTEXPARAMETERFPROC, glTexParameterf); GL_GET_PROC_ADR(PFNGLTEXPARAMETERFPROC, glTexParameterf);
GL_GET_PROC_ADR(PFNGLACTIVETEXTUREPROC, glActiveTexture);
GL_GET_PROC_ADR(PFNGLBLENDCOLORPROC, glBlendColor);
GL_GET_PROC_ADR(PFNGLREADBUFFERPROC, glReadBuffer);
#endif #endif
GL_GET_PROC_ADR(PFNGLCREATESHADERPROC, glCreateShader); GL_GET_PROC_ADR(PFNGLCREATESHADERPROC, glCreateShader);

10
src/Graphics/OpenGLContext/GLFunctions.h
View File

@ -8,10 +8,16 @@
#include <winlnxdefs.h> #include <winlnxdefs.h>
#endif #endif
#ifdef EGL
#include <GL/glcorearb.h>
#else
#include <GL/gl.h> #include <GL/gl.h>
#endif
#include <GL/glext.h> #include <GL/glext.h>
#ifdef EGL #ifdef EGL
extern PFNGLBLENDFUNCPROC glBlendFunc; extern PFNGLBLENDFUNCPROC glBlendFunc;
extern PFNGLPIXELSTOREIPROC glPixelStorei; extern PFNGLPIXELSTOREIPROC glPixelStorei;
extern PFNGLCLEARCOLORPROC glClearColor; extern PFNGLCLEARCOLORPROC glClearColor;
@ -39,12 +45,16 @@ extern PFNGLGETFLOATVPROC glGetFloatv;
extern PFNGLDELETETEXTURESPROC glDeleteTextures; extern PFNGLDELETETEXTURESPROC glDeleteTextures;
extern PFNGLGENTEXTURESPROC glGenTextures; extern PFNGLGENTEXTURESPROC glGenTextures;
extern PFNGLTEXPARAMETERFPROC glTexParameterf; extern PFNGLTEXPARAMETERFPROC glTexParameterf;
extern PFNGLACTIVETEXTUREPROC glActiveTexture;
extern PFNGLBLENDCOLORPROC glBlendColor;
extern PFNGLREADBUFFERPROC glReadBuffer;
#endif #endif
#ifdef OS_WINDOWS #ifdef OS_WINDOWS
extern PFNGLACTIVETEXTUREPROC glActiveTexture; extern PFNGLACTIVETEXTUREPROC glActiveTexture;
extern PFNGLBLENDCOLORPROC glBlendColor; extern PFNGLBLENDCOLORPROC glBlendColor;
#endif #endif
extern PFNGLCREATESHADERPROC glCreateShader; extern PFNGLCREATESHADERPROC glCreateShader;
extern PFNGLCOMPILESHADERPROC glCompileShader; extern PFNGLCOMPILESHADERPROC glCompileShader;
extern PFNGLSHADERSOURCEPROC glShaderSource; extern PFNGLSHADERSOURCEPROC glShaderSource;