.gitlab-ci.yml

@@ -50,7 +50,6 @@ x86_build:
       libegl1-mesa-dev
       libgbm-dev
       libgl1-mesa-dev
-      libglew-dev
       libudev-dev
       libwayland-dev
       libx11-dev

CMakeLists.txt

@@ -10,16 +10,9 @@ find_package (OpenGL REQUIRED)
 find_package (GLUT REQUIRED)
 find_package (X11)
 
-find_library (GLEW_glew_LIBRARY GLEW
-	/usr/lib
-)
-
-find_path (GLEW_INCLUDE_DIR GL/glew.h
-      /usr/include/GL
-)
+set (GLAD_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/glad/include)
 
 if (PKG_CONFIG_FOUND AND NOT WIN32)
-	pkg_check_modules (GLEW REQUIRED glew>=1.5.4)
 	pkg_check_modules (EGL egl)
 	pkg_check_modules (GLESV1 glesv1_cm)
 	pkg_check_modules (GLESV2 glesv2)
@@ -78,13 +71,12 @@ if (CMAKE_COMPILER_IS_GNUCC)
 		#-Wold-style-definition
 		#-Wdeclaration-after-statement
         )
-	set (CMAKE_C_FLAGS "-Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Wbad-function-cast ${CMAKE_CXX_FLAGS}")
+	set (CMAKE_C_FLAGS "-Wmissing-prototypes -Wnested-externs -Wbad-function-cast ${CMAKE_CXX_FLAGS}")
 endif ()
 
 if (WIN32)
 	# Nobody likes to include windows.h:
 	# - Microsoft's GL/gl.h header depends on windows.h but doesn't include it;
-	# - GLEW temporarily defines the necessary defines but undefines them later
 	# - certain GLUT distributions don't include it;
 	# - most of our programs are meant to be portable so don't include it.
 	#

configure.ac

@@ -92,11 +92,6 @@ AC_EGREP_HEADER([glutInitContextProfile],
 		[AC_DEFINE(HAVE_FREEGLUT)],
 		[])
 
-dnl Check for GLEW
-PKG_CHECK_MODULES(GLEW, [glew >= 1.5.4])
-DEMO_CFLAGS="$DEMO_CFLAGS $GLEW_CFLAGS"
-DEMO_LIBS="$DEMO_LIBS $GLEW_LIBS"
-
 # LIBS was set by AC_CHECK_LIB above
 LIBS=""
 
@@ -181,7 +176,7 @@ esac
 
 dnl Set up C warning flags.  Copy of XORG_CWARNFLAGS.
 if  test "x$GCC" = xyes ; then
-    CWARNFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes \
+    CWARNFLAGS="-Wall -Wpointer-arith -Wmissing-prototypes \
 -Wmissing-declarations -Wnested-externs -fno-strict-aliasing \
 -Wbad-function-cast"
     case `$CC -dumpversion` in
@@ -331,6 +326,7 @@ AC_OUTPUT([
 	src/egl/oes_vg/Makefile
 	src/fp/Makefile
 	src/fpglsl/Makefile
+	src/glad/Makefile
 	src/glsl/Makefile
 	src/gs/Makefile
 	src/data/Makefile

index.html

@@ -67,15 +67,13 @@ The Mesa demos can be built with autoconf or <a href="http://www.cmake.org/">CMa
 <h2>Prerequisites</h2>
 
 <p>
-You'll need <a href="http://glew.sourceforge.net/">glew</a> version 1.5.4
-or later and glut or <a href="http://freeglut.sourceforge.net/">freeglut</a> (runtime libraries and header files).
+You'll need glut or <a href="http://freeglut.sourceforge.net/">freeglut</a> (runtime libraries and header files).
 </p>
 
 <p>
 If you're using an RPM-based Linux distro you can install these items with:
 </p>
 <pre>
-yum install glew glew-devel
 yum install freeglut freeglut-devel
 </pre>
 
@@ -83,7 +81,7 @@ yum install freeglut freeglut-devel
 And if you're using a Debian based Linux distro you can install these items with:
 </p>
 <pre>
-apt-get install libglew-dev freeglut3-dev
+apt-get install freeglut3-dev
 </pre>
 
 
@@ -123,8 +121,8 @@ make
   <li>Start the CMake GUI.</li>
   <li>Specify where this source is and where to build the binaries.</li>
   <li>Click <i>Configure</i>.</li>
-  <li>Specify where GLEW and GLUT headers and libraries are; specifically via the 
-  <b>GLEW_INCLUDE_DIR</b>, <b>GLEW_glew_LIBRARY</b>, <b>GLUT_INCLUDE_DIR</b>, and <b>GLUT_glut_LIBRARY</b> variables.</li>
+  <li>Specify where GLUT headers and libraries are; specifically via the 
+  <b>GLUT_INCLUDE_DIR</b>, and <b>GLUT_glut_LIBRARY</b> variables.</li>
   <li>Click <i>Generate</i>.</li>
   <li>Open the generated <b>mesademos.sln</b> Visual Studio solution file and build the target <b>ALL</b>.
 </ul>
@@ -158,9 +156,6 @@ set (CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
 Create a <b>Cache.cmake</b> file containing:
 </p>
 <pre>
-set (GLEW_INCLUDE_DIR "/path/to/glew/include" CACHE PATH "" FORCE)
-set (GLEW_glew_LIBRARY "/path/to/glew/lib/libglew32.a" CACHE FILEPATH "" FORCE)
-
 set (GLUT_INCLUDE_DIR "/path/to/glut/include" CACHE PATH "" FORCE)
 set (GLUT_glut_LIBRARY "/path/to/glut/lib/libglut32.a" CACHE FILEPATH "" FORCE)
 </pre>

src/CMakeLists.txt

+add_subdirectory (glad)
+
 add_subdirectory (util)
 
 add_subdirectory (demos)

src/Makefile.am

@@ -23,6 +23,7 @@
 #    Eric Anholt <eric@anholt.net>
 
 SUBDIRS = \
+	glad \
 	util \
 	data \
 	demos \

src/demos/CMakeLists.txt

@@ -2,7 +2,7 @@ include_directories (
 	${CMAKE_SOURCE_DIR}/src/util
 	${OPENGL_INCLUDE_PATH}
 	${GLUT_INCLUDE_DIR}
-	${GLEW_INCLUDE_DIR}
+	${GLAD_INCLUDE_DIR}
 )
 
 link_directories (
@@ -14,7 +14,7 @@ link_libraries (
 	${OPENGL_gl_LIBRARY}
 	${OPENGL_glu_LIBRARY}
 	${GLUT_glut_LIBRARY}
-	${GLEW_glew_LIBRARY}
+	glad
 )
 
 set (subdir demos)

src/demos/Makefile.am

@@ -25,6 +25,7 @@
 AM_CFLAGS = \
 	$(DEMO_CFLAGS) \
 	$(GLUT_CFLAGS) \
+	-I$(top_srcdir)/src/glad/include \
 	-I$(top_srcdir)/src/util
 AM_LDFLAGS = \
 	$(DEMO_LIBS) \
@@ -93,28 +94,29 @@ tunnel_SOURCES = \
 	tunnel.c \
 	tunneldat.h
 
-copypix_LDADD = ../util/libutil.la
-cubemap_LDADD = ../util/libutil.la
-cuberender_LDADD = ../util/libutil.la
-drawpix_LDADD = ../util/libutil.la
-dissolve_LDADD = ../util/libutil.la
-engine_LDADD = ../util/libutil.la
-fbo_firecube_LDADD = ../util/libutil.la
-fire_LDADD = ../util/libutil.la
-gloss_LDADD = ../util/libutil.la
-ipers_LDADD = ../util/libutil.la
-isosurf_LDADD = ../util/libutil.la
-lodbias_LDADD = ../util/libutil.la
-multiarb_LDADD = ../util/libutil.la
-projtex_LDADD = ../util/libutil.la
-readpix_LDADD = ../util/libutil.la
-reflect_LDADD = ../util/libutil.la
-teapot_LDADD = ../util/libutil.la
-texcyl_LDADD = ../util/libutil.la
-textures_LDADD = ../util/libutil.la
-tunnel_LDADD = ../util/libutil.la
-tunnel2_LDADD = ../util/libutil.la
-winpos_LDADD = ../util/libutil.la
+LDADD = ../glad/libglad.la
+copypix_LDADD = ../util/libutil.la ../glad/libglad.la
+cubemap_LDADD = ../util/libutil.la ../glad/libglad.la
+cuberender_LDADD = ../util/libutil.la ../glad/libglad.la
+drawpix_LDADD = ../util/libutil.la ../glad/libglad.la
+dissolve_LDADD = ../util/libutil.la ../glad/libglad.la
+engine_LDADD = ../util/libutil.la ../glad/libglad.la
+fbo_firecube_LDADD = ../util/libutil.la ../glad/libglad.la
+fire_LDADD = ../util/libutil.la ../glad/libglad.la
+gloss_LDADD = ../util/libutil.la ../glad/libglad.la
+ipers_LDADD = ../util/libutil.la ../glad/libglad.la
+isosurf_LDADD = ../util/libutil.la ../glad/libglad.la
+lodbias_LDADD = ../util/libutil.la ../glad/libglad.la
+multiarb_LDADD = ../util/libutil.la ../glad/libglad.la
+projtex_LDADD = ../util/libutil.la ../glad/libglad.la
+readpix_LDADD = ../util/libutil.la ../glad/libglad.la
+reflect_LDADD = ../util/libutil.la ../glad/libglad.la
+teapot_LDADD = ../util/libutil.la ../glad/libglad.la
+texcyl_LDADD = ../util/libutil.la ../glad/libglad.la
+textures_LDADD = ../util/libutil.la ../glad/libglad.la
+tunnel_LDADD = ../util/libutil.la ../glad/libglad.la
+tunnel2_LDADD = ../util/libutil.la ../glad/libglad.la
+winpos_LDADD = ../util/libutil.la ../glad/libglad.la
 
 EXTRA_DIST = \
 	README

src/demos/arbfplight.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 
@@ -358,7 +358,7 @@ int main( int argc, char *argv[] )
    glutInit( &argc, argv );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
    Win = glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutSpecialFunc( SpecialKey );

src/demos/arbfslight.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 static GLfloat diffuse[4] = { 0.5f, 0.5f, 1.0f, 1.0f };
@@ -256,7 +256,7 @@ main(int argc, char *argv[])
    glutInit(&argc, argv);
    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
    glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc(Reshape);
    glutKeyboardFunc(Key);
    glutSpecialFunc(SpecialKey);

src/demos/arbocclude.c

@@ -29,7 +29,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 #define NUM_OCC 10
@@ -272,7 +272,7 @@ int main( int argc, char *argv[] )
    glutInit( &argc, argv );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
    Win = glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutSpecialFunc( SpecialKey );

src/demos/arbocclude2.c

@@ -31,7 +31,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 static GLboolean Anim = GL_TRUE;
@@ -331,7 +331,7 @@ int main( int argc, char *argv[] )
    glutInit( &argc, argv );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
    Win = glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutSpecialFunc( SpecialKey );

src/demos/copypix.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 #include "readtex.h"
@@ -254,7 +254,7 @@ int main( int argc, char *argv[] )
       glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE);
 
    glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
 
    Init(ciMode, filename);
    Usage();

src/demos/cubemap.c

@@ -39,7 +39,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 #include "readtex.h"
 
@@ -539,25 +539,22 @@ static void load_envmaps(void)
 static void init( GLboolean useImageFiles )
 {
    /* check for extensions */
-   if (!GLEW_ARB_texture_cube_map) {
+   if (!GLAD_GL_ARB_texture_cube_map) {
       printf("Sorry, this demo requires GL_ARB_texture_cube_map\n");
       exit(0);
    }
 
    /* Needed for glGenerateMipmapEXT / auto mipmapping
     */
-   supportFBO = GLEW_EXT_framebuffer_object;
+   supportFBO = GLAD_GL_EXT_framebuffer_object;
 
-   if (!supportFBO && !GLEW_SGIS_generate_mipmap) {
+   if (!supportFBO && !GLAD_GL_SGIS_generate_mipmap) {
       printf("Sorry, this demo requires GL_EXT_framebuffer_object or "
 	     "GL_SGIS_generate_mipmap\n");
       exit(0);
    }
 
-   /* GLEW doesn't know about this extension yet, so use the old GLUT function
-    * to check for availability.
-    */
-   supportSeamless = glutExtensionSupported("GL_ARB_seamless_cube_map");
+   supportSeamless = GLAD_GL_ARB_seamless_cube_map;
 
    printf("GL_RENDERER: %s\n", (char *) glGetString(GL_RENDERER));
 
@@ -619,7 +616,7 @@ int main( int argc, char *argv[] )
    glutInit(&argc, argv);
    glutInitDisplayMode( GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE );
    glutCreateWindow("Texture Cube Mapping");
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc( reshape );
    glutKeyboardFunc( key );
    glutSpecialFunc( specialkey );

src/demos/cuberender.c

@@ -10,7 +10,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 #include "shaderutil.h"
 
@@ -572,7 +572,7 @@ main(int argc, char *argv[])
    glutInit(&argc, argv);
    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH | GLUT_STENCIL);
    Win = glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc(Reshape);
    glutKeyboardFunc(Key);
    glutSpecialFunc(SpecialKey);

src/demos/dinoshade.c

@@ -43,7 +43,7 @@
 #include <windows.h>
 #endif
 #define GL_GLEXT_LEGACY
-#include <GL/glew.h>    /* OpenGL Utility Toolkit header */
+#include <glad/glad.h>    /* OpenGL Utility Toolkit header */
 #include "glut_wrap.h"    /* OpenGL Utility Toolkit header */
 
 /* Some <math.h> files do not define M_PI... */
@@ -813,7 +813,7 @@ main(int argc, char **argv)
 #endif
 
   glutCreateWindow("Shadowy Leapin' Lizards");
-  glewInit();
+  gladLoadGL();
 
   if (glutGet(GLUT_WINDOW_STENCIL_SIZE) <= 1) {
     printf("dinoshade: Sorry, I need at least 2 bits of stencil.\n");
@@ -850,7 +850,7 @@ main(int argc, char **argv)
   makeDinosaur();
 
 #ifdef GL_VERSION_1_1
-  if (GLEW_VERSION_1_1 && !forceExtension) {
+  if (GLAD_GL_VERSION_1_1 && !forceExtension) {
     polygonOffsetVersion = ONE_DOT_ONE;
     glPolygonOffset(-2.0, -9.0);
   } else
@@ -858,7 +858,7 @@ main(int argc, char **argv)
   {
 #ifdef GL_EXT_polygon_offset
   /* check for the polygon offset extension */
-  if (GLEW_EXT_polygon_offset) {
+  if (GLAD_GL_EXT_polygon_offset) {
     polygonOffsetVersion = EXTENSION;
     glPolygonOffsetEXT(-2.0, -0.002);
   } else 

src/demos/engine.c

@@ -9,7 +9,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 #include "readtex.h"
 #include "trackball.h"
@@ -1328,7 +1328,7 @@ main(int argc, char *argv[])
    glutInit(&argc, argv);
    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
    Win = glutCreateWindow("OpenGL Engine Demo");
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc(Reshape);
    glutMouseFunc(Mouse);
    glutMotionFunc(Motion);

src/demos/fbo_firecube.c

@@ -33,7 +33,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 #include "readtex.h"
 
@@ -1060,7 +1060,7 @@ main(int argc, char *argv[])
    glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE);
 
    Win = glutCreateWindow("fbo_firecube");
-   glewInit();
+   gladLoadGL();
    init(argc, argv);
 
    glutDisplayFunc(draw);

src/demos/fbotexture.c

@@ -13,7 +13,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 /* For debug */
@@ -699,7 +699,7 @@ main(int argc, char *argv[])
       glutIdleFunc(Idle);
 
    ParseArgs(argc, argv);
-   glewInit();
+   gladLoadGL();
    Init();
    Usage();
 

src/demos/fogcoord.c

@@ -10,7 +10,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <math.h>
-#include <GL/glew.h>
+#include <glad/glad.h>
 #include "glut_wrap.h"
 
 #define DEPTH 5.0f
@@ -116,7 +116,7 @@ SetFogMode(GLint fogMode)
 static GLboolean
 SetFogCoord(GLboolean fogCoord)
 {
-   if (!GLEW_EXT_fog_coord) {
+   if (!GLAD_GL_EXT_fog_coord) {
       return GL_FALSE;
    }
 
@@ -365,7 +365,7 @@ Init(void)
 
    printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
 
-   if (!GLEW_EXT_fog_coord) {
+   if (!GLAD_GL_EXT_fog_coord) {
       printf("GL_EXT_fog_coord not supported!\n");
    }
 
@@ -392,7 +392,7 @@ Init(void)
    glEnableClientState(GL_TEXTURE_COORD_ARRAY);
    glTexCoordPointer(2, GL_FLOAT, 0, texcoord_pointer);
 
-   if (GLEW_EXT_fog_coord) {
+   if (GLAD_GL_EXT_fog_coord) {
       glEnableClientState(GL_FOG_COORDINATE_ARRAY_EXT);
       glFogCoordPointerEXT(GL_FLOAT, 0, fogcoord_pointer);
    }
@@ -408,7 +408,7 @@ main( int argc, char *argv[] )
    glutInit( &argc, argv );
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH );
    glutCreateWindow(argv[0]);
-   glewInit();
+   gladLoadGL();
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutDisplayFunc( Display );