From 85fc5ec31f0a241645b3b9a7a93a5f8868c4722d Mon Sep 17 00:00:00 2001 From: Francisco Zurita Date: Sun, 29 Jan 2017 21:48:12 +0700 Subject: [PATCH] Fix GLFunctions for EGL. --- src/Graphics/OpenGLContext/GLFunctions.cpp | 6 ++++++ src/Graphics/OpenGLContext/GLFunctions.h | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/src/Graphics/OpenGLContext/GLFunctions.cpp b/src/Graphics/OpenGLContext/GLFunctions.cpp index 62a8b82c..b454029e 100644 --- a/src/Graphics/OpenGLContext/GLFunctions.cpp +++ b/src/Graphics/OpenGLContext/GLFunctions.cpp @@ -63,6 +63,9 @@ PFNGLGETFLOATVPROC glGetFloatv; PFNGLDELETETEXTURESPROC glDeleteTextures; PFNGLGENTEXTURESPROC glGenTextures; PFNGLTEXPARAMETERFPROC glTexParameterf; +PFNGLACTIVETEXTUREPROC glActiveTexture; +PFNGLBLENDCOLORPROC glBlendColor; +PFNGLREADBUFFERPROC glReadBuffer; #endif PFNGLCREATESHADERPROC glCreateShader; PFNGLCOMPILESHADERPROC glCompileShader; @@ -185,6 +188,9 @@ void initGLFunctions() GL_GET_PROC_ADR(PFNGLDELETETEXTURESPROC, glDeleteTextures); GL_GET_PROC_ADR(PFNGLGENTEXTURESPROC, glGenTextures); 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 GL_GET_PROC_ADR(PFNGLCREATESHADERPROC, glCreateShader); diff --git a/src/Graphics/OpenGLContext/GLFunctions.h b/src/Graphics/OpenGLContext/GLFunctions.h index 0def3b31..68de8300 100644 --- a/src/Graphics/OpenGLContext/GLFunctions.h +++ b/src/Graphics/OpenGLContext/GLFunctions.h @@ -8,10 +8,16 @@ #include #endif +#ifdef EGL +#include +#else #include +#endif + #include #ifdef EGL + extern PFNGLBLENDFUNCPROC glBlendFunc; extern PFNGLPIXELSTOREIPROC glPixelStorei; extern PFNGLCLEARCOLORPROC glClearColor; @@ -39,12 +45,16 @@ extern PFNGLGETFLOATVPROC glGetFloatv; extern PFNGLDELETETEXTURESPROC glDeleteTextures; extern PFNGLGENTEXTURESPROC glGenTextures; extern PFNGLTEXPARAMETERFPROC glTexParameterf; +extern PFNGLACTIVETEXTUREPROC glActiveTexture; +extern PFNGLBLENDCOLORPROC glBlendColor; +extern PFNGLREADBUFFERPROC glReadBuffer; #endif #ifdef OS_WINDOWS extern PFNGLACTIVETEXTUREPROC glActiveTexture; extern PFNGLBLENDCOLORPROC glBlendColor; #endif + extern PFNGLCREATESHADERPROC glCreateShader; extern PFNGLCOMPILESHADERPROC glCompileShader; extern PFNGLSHADERSOURCEPROC glShaderSource;