changeset 96:50a69d327b4f

Remove support for GL_GLEXT_PROTOTYPES.
author Matti Hamalainen <ccr@tnsp.org>
date Tue, 25 May 2021 02:35:14 +0300
parents 59195e95c080
children 05677852afd5
files Makefile dmglrender.cpp
diffstat 2 files changed, 2 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Tue May 25 01:00:06 2021 +0300
+++ b/Makefile	Tue May 25 02:35:14 2021 +0300
@@ -2,7 +2,7 @@
 ### Generic UNIX targets
 ###
 
-#CXXFLAGS ?= -DGL_GLEXT_PROTOTYPES
+#CXXFLAGS ?=
 #LDFLAGS ?=
 
 BINPATH ?= ./
--- a/dmglrender.cpp	Tue May 25 01:00:06 2021 +0300
+++ b/dmglrender.cpp	Tue May 25 02:35:14 2021 +0300
@@ -10,9 +10,6 @@
 #include <GL/glu.h>
 
 
-#ifdef GL_GLEXT_PROTOTYPES
-#define DM_GLEXT_INIT(extproctype, extprocname) /* stub */
-#else
 #define DM_GLEXT_INIT(extproctype, extprocname) extproctype extprocname = NULL;
 #include "dmglexts.h"
 #undef DM_GLEXT_INIT
@@ -53,7 +50,6 @@
 
     return ptr;
 }
-#endif
 
 
 static bool dmCompileShader(const GLenum stype, const std::string &src, GLuint &shader)
@@ -145,7 +141,6 @@
     bool status = true;
     dmMsg("Checking for required OpenGL extensions ..\n");
 
-#ifndef GL_GLEXT_PROTOTYPES
     dmGLCheckExtension("GL_ARB_shader_objects", status);
     dmGLCheckExtension("GL_ARB_shading_language_100", status);
     dmGLCheckExtension("GL_ARB_vertex_shader", status);
@@ -159,7 +154,7 @@
 #define DM_GLEXT_INIT(extproctype, extprocname) \
     extprocname = (extproctype) dmGLExtInit(#extprocname, status);
 #include "dmglexts.h"
-#endif
+#undef DM_GLEXT_INIT
 
     return status;
 }