diff options
| author | Miles Macklin <[email protected]> | 2018-03-19 15:10:24 +1300 |
|---|---|---|
| committer | Miles Macklin <[email protected]> | 2018-03-19 15:10:24 +1300 |
| commit | 8ee05c79ae1748ef132a12e4fb0af284899faec6 (patch) | |
| tree | 82bd5aa1892e28ce7886b6cfeafe66a47ff38e67 /demo/opengl/shader.h | |
| parent | Flex 1.2 (beta 2) (diff) | |
| download | flex-8ee05c79ae1748ef132a12e4fb0af284899faec6.tar.xz flex-8ee05c79ae1748ef132a12e4fb0af284899faec6.zip | |
Flex 1.2.0 release
Diffstat (limited to 'demo/opengl/shader.h')
| -rw-r--r-- | demo/opengl/shader.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/demo/opengl/shader.h b/demo/opengl/shader.h index dd9468a..cadf557 100644 --- a/demo/opengl/shader.h +++ b/demo/opengl/shader.h @@ -33,14 +33,12 @@ #define ENABLE_SIMPLE_FLUID 0 -#include "../../external/glew/include/gl/glew.h" +#include "../../external/glad/include/glad/glad.h" #include "../../external/SDL2-2.0.4/include/SDL.h" -#pragma comment (lib, "glu32.lib") /* link OpenGL Utility lib */ #pragma comment (lib, "opengl32.lib") /* link Microsoft OpenGL lib */ #include <gl/GL.h> -#include <gl/GLU.h> // Begin Add Android Support #elif ANDROID @@ -48,14 +46,13 @@ // End Add Android Support #elif __linux__ -#include <external/glew/include/GL/glew.h> +#include "../../external/glad/include/glad/glad.h" #include <GL/gl.h> #include <GL/freeglut.h> #elif __APPLE__ #define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED #include <opengl/gl3.h> -#include <glut/glut.h> #elif PLATFORM_IOS #if OGL1 @@ -78,7 +75,8 @@ void glAssert(const char* msg, long line, const char* file); #endif -GLuint CompileProgram(const char *vsource=NULL, const char *fsource=NULL, const char* gsource=NULL); - -void DrawPlane(const Vec4& p, bool color=true); - +namespace OGL_Renderer +{ + GLuint CompileProgram(const char *vsource = NULL, const char *fsource = NULL, const char* gsource = NULL); + void DrawPlane(const Vec4& p, bool color = true); +} |