diff options
Diffstat (limited to 'src/trivial')
55 files changed, 165 insertions, 111 deletions
diff --git a/src/trivial/clear-fbo-scissor.c b/src/trivial/clear-fbo-scissor.c index 2d1ee4fc..aa1c1f9c 100644 --- a/src/trivial/clear-fbo-scissor.c +++ b/src/trivial/clear-fbo-scissor.c @@ -9,7 +9,7 @@ #include <stdlib.h> #include <math.h> #include <string.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -223,11 +223,12 @@ main(int argc, char *argv[]) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/clear-fbo-tex.c b/src/trivial/clear-fbo-tex.c index 94534bdb..dfc5d608 100644 --- a/src/trivial/clear-fbo-tex.c +++ b/src/trivial/clear-fbo-tex.c @@ -5,7 +5,7 @@ #include <math.h> #include <string.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -213,7 +213,7 @@ main( int argc, char *argv[] ) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -221,5 +221,6 @@ main( int argc, char *argv[] ) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/clear-fbo.c b/src/trivial/clear-fbo.c index 20658363..fe2d1c03 100644 --- a/src/trivial/clear-fbo.c +++ b/src/trivial/clear-fbo.c @@ -5,7 +5,7 @@ #include <math.h> #include <string.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -155,12 +155,13 @@ main(int argc, char *argv[]) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/draw2arrays.c b/src/trivial/draw2arrays.c index 2125727f..97ef65ea 100644 --- a/src/trivial/draw2arrays.c +++ b/src/trivial/draw2arrays.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLfloat pos[][3] = @@ -107,11 +107,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/drawarrays.c b/src/trivial/drawarrays.c index da4de10c..8fa0a965 100644 --- a/src/trivial/drawarrays.c +++ b/src/trivial/drawarrays.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -118,11 +118,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/drawelements-large.c b/src/trivial/drawelements-large.c index e0be25b3..c647de8b 100644 --- a/src/trivial/drawelements-large.c +++ b/src/trivial/drawelements-large.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #define NR_VERTS 20000 @@ -111,11 +111,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/drawelements.c b/src/trivial/drawelements.c index 7ef9318b..84555e17 100644 --- a/src/trivial/drawelements.c +++ b/src/trivial/drawelements.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLfloat verts[][4] = { @@ -111,11 +111,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/drawrange.c b/src/trivial/drawrange.c index e610c58b..b3c8bcc9 100644 --- a/src/trivial/drawrange.c +++ b/src/trivial/drawrange.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLfloat verts[][4] = { @@ -109,11 +109,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/fs-tri.c b/src/trivial/fs-tri.c index 863b1766..1f1c4be8 100644 --- a/src/trivial/fs-tri.c +++ b/src/trivial/fs-tri.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -194,13 +194,14 @@ main(int argc, char *argv[]) glutInitWindowSize(200, 200); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH); win = glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutSpecialFunc(SpecialKey); glutDisplayFunc(Redisplay); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/lineloop-elts.c b/src/trivial/lineloop-elts.c index e5919f65..b53aaa71 100644 --- a/src/trivial/lineloop-elts.c +++ b/src/trivial/lineloop-elts.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLfloat verts[][4] = { @@ -111,11 +111,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/long-fixed-func.c b/src/trivial/long-fixed-func.c index d49c6624..85d7ae31 100644 --- a/src/trivial/long-fixed-func.c +++ b/src/trivial/long-fixed-func.c @@ -5,7 +5,7 @@ -#include <glad/glad.h> +#include "glad/gl.h" #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -143,11 +143,12 @@ main(int argc, char **argv) if (glutCreateWindow(*argv) == GL_FALSE) { exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/point-param.c b/src/trivial/point-param.c index 1e41f97b..2f9584f4 100644 --- a/src/trivial/point-param.c +++ b/src/trivial/point-param.c @@ -22,7 +22,7 @@ * OF THIS SOFTWARE. */ -#include <glad/glad.h> +#include "glad/gl.h" #include <math.h> #include <stdio.h> #include <string.h> @@ -147,7 +147,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -155,5 +155,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/quad-tex-3d.c b/src/trivial/quad-tex-3d.c index 3421a36a..acf72c30 100644 --- a/src/trivial/quad-tex-3d.c +++ b/src/trivial/quad-tex-3d.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -169,7 +169,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -177,5 +177,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/quad-tex-pbo.c b/src/trivial/quad-tex-pbo.c index 45a0301c..a0a5b310 100644 --- a/src/trivial/quad-tex-pbo.c +++ b/src/trivial/quad-tex-pbo.c @@ -22,7 +22,7 @@ * OF THIS SOFTWARE. */ -#include <glad/glad.h> +#include "glad/gl.h" #include <stdio.h> #include <string.h> @@ -172,7 +172,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -180,5 +180,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/quad-tex-sub.c b/src/trivial/quad-tex-sub.c index 6c8313a7..2b23f929 100644 --- a/src/trivial/quad-tex-sub.c +++ b/src/trivial/quad-tex-sub.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -192,7 +192,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -200,5 +200,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/readpixels.c b/src/trivial/readpixels.c index fb88570c..c8052315 100644 --- a/src/trivial/readpixels.c +++ b/src/trivial/readpixels.c @@ -3,7 +3,7 @@ */ -#include <glad/glad.h> +#include "glad/gl.h" #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -92,7 +92,7 @@ int main(int argc, char **argv) if (argc > 1) Zoom = atof(argv[1]); - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -100,5 +100,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/sub-tex.c b/src/trivial/sub-tex.c index 6277cfc7..a3b8f491 100644 --- a/src/trivial/sub-tex.c +++ b/src/trivial/sub-tex.c @@ -6,7 +6,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -127,11 +127,12 @@ int main(int argc, char **argv) if (!Win) { exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tex-quads.c b/src/trivial/tex-quads.c index d6158812..189e6e5f 100644 --- a/src/trivial/tex-quads.c +++ b/src/trivial/tex-quads.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #define NUM_TEX 10 @@ -133,11 +133,12 @@ int main(int argc, char **argv) if (!Win) { exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-2101010-dlist.c b/src/trivial/tri-2101010-dlist.c index ccc6b6ec..8eaf1db1 100644 --- a/src/trivial/tri-2101010-dlist.c +++ b/src/trivial/tri-2101010-dlist.c @@ -28,7 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLenum doubleBuffer = 1; @@ -163,12 +163,13 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-2101010.c b/src/trivial/tri-2101010.c index d166f519..ac642b51 100644 --- a/src/trivial/tri-2101010.c +++ b/src/trivial/tri-2101010.c @@ -28,7 +28,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLenum doubleBuffer = 1; @@ -152,12 +152,13 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-array-interleaved.c b/src/trivial/tri-array-interleaved.c index b0272063..6817fa95 100644 --- a/src/trivial/tri-array-interleaved.c +++ b/src/trivial/tri-array-interleaved.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" struct { @@ -110,11 +110,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-blend-color.c b/src/trivial/tri-blend-color.c index 92d46018..68365e23 100644 --- a/src/trivial/tri-blend-color.c +++ b/src/trivial/tri-blend-color.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -133,7 +133,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -141,5 +141,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-blend-max.c b/src/trivial/tri-blend-max.c index 57489659..fcce5ea8 100644 --- a/src/trivial/tri-blend-max.c +++ b/src/trivial/tri-blend-max.c @@ -42,7 +42,7 @@ * Use the 't' key to toggle the order of drawing polygons. */ #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static int leftFirst = GL_TRUE; @@ -137,11 +137,12 @@ int main(int argc, char** argv) glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); glutInitWindowSize (200, 200); glutCreateWindow (argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); init(); glutReshapeFunc (reshape); glutKeyboardFunc (keyboard); glutDisplayFunc (display); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-blend-min.c b/src/trivial/tri-blend-min.c index cece08d3..182db755 100644 --- a/src/trivial/tri-blend-min.c +++ b/src/trivial/tri-blend-min.c @@ -42,7 +42,7 @@ * Use the 't' key to toggle the order of drawing polygons. */ #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static int leftFirst = GL_TRUE; @@ -137,11 +137,12 @@ int main(int argc, char** argv) glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); glutInitWindowSize (200, 200); glutCreateWindow (argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); init(); glutReshapeFunc (reshape); glutKeyboardFunc (keyboard); glutDisplayFunc (display); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-blend-revsub.c b/src/trivial/tri-blend-revsub.c index 5018a125..0874cb34 100644 --- a/src/trivial/tri-blend-revsub.c +++ b/src/trivial/tri-blend-revsub.c @@ -42,7 +42,7 @@ * Use the 't' key to toggle the order of drawing polygons. */ #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static int leftFirst = GL_TRUE; @@ -137,11 +137,12 @@ int main(int argc, char** argv) glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); glutInitWindowSize (200, 200); glutCreateWindow (argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); init(); glutReshapeFunc (reshape); glutKeyboardFunc (keyboard); glutDisplayFunc (display); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-blend-sub.c b/src/trivial/tri-blend-sub.c index 6870112f..0356bae7 100644 --- a/src/trivial/tri-blend-sub.c +++ b/src/trivial/tri-blend-sub.c @@ -42,7 +42,7 @@ * Use the 't' key to toggle the order of drawing polygons. */ #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static int leftFirst = GL_TRUE; @@ -137,11 +137,12 @@ int main(int argc, char** argv) glutInitDisplayMode (GLUT_SINGLE | GLUT_RGB); glutInitWindowSize (200, 200); glutCreateWindow (argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); init(); glutReshapeFunc (reshape); glutKeyboardFunc (keyboard); glutDisplayFunc (display); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-edgeflag-pv.c b/src/trivial/tri-edgeflag-pv.c index 482becaa..f696e769 100644 --- a/src/trivial/tri-edgeflag-pv.c +++ b/src/trivial/tri-edgeflag-pv.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static GLenum doubleBuffer; @@ -139,12 +139,13 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-fbo-tex-mip.c b/src/trivial/tri-fbo-tex-mip.c index 293974b9..5ca54e1a 100644 --- a/src/trivial/tri-fbo-tex-mip.c +++ b/src/trivial/tri-fbo-tex-mip.c @@ -1,7 +1,7 @@ /* Framebuffer object test */ -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #include <assert.h> #include <stdio.h> @@ -247,7 +247,7 @@ main(int argc, char *argv[]) glutInitWindowSize(Width, Height); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); Win = glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Display); @@ -255,5 +255,6 @@ main(int argc, char *argv[]) glutIdleFunc(Idle); Init(argc, argv); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-fbo-tex.c b/src/trivial/tri-fbo-tex.c index 327fe38b..0c4e17db 100644 --- a/src/trivial/tri-fbo-tex.c +++ b/src/trivial/tri-fbo-tex.c @@ -1,7 +1,7 @@ /* Framebuffer object test */ -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #include <assert.h> #include <stdio.h> @@ -243,7 +243,7 @@ main(int argc, char *argv[]) glutInitWindowSize(Width, Height); glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE); Win = glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Display); @@ -251,5 +251,6 @@ main(int argc, char *argv[]) glutIdleFunc(Idle); Init(argc, argv); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-fbo.c b/src/trivial/tri-fbo.c index 76985a96..b2469c7c 100644 --- a/src/trivial/tri-fbo.c +++ b/src/trivial/tri-fbo.c @@ -5,7 +5,7 @@ #include <math.h> #include <string.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -191,7 +191,7 @@ main( int argc, char *argv[] ) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -199,5 +199,6 @@ main( int argc, char *argv[] ) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-fp-const-imm.c b/src/trivial/tri-fp-const-imm.c index 627d67da..334b9fd8 100644 --- a/src/trivial/tri-fp-const-imm.c +++ b/src/trivial/tri-fp-const-imm.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -160,7 +160,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -168,5 +168,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-fp.c b/src/trivial/tri-fp.c index b4fedd35..0a96b68c 100644 --- a/src/trivial/tri-fp.c +++ b/src/trivial/tri-fp.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -158,7 +158,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -166,5 +166,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-multitex-vbo.c b/src/trivial/tri-multitex-vbo.c index fbd8d743..bcd7f684 100644 --- a/src/trivial/tri-multitex-vbo.c +++ b/src/trivial/tri-multitex-vbo.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #define NR_VERTS 4 @@ -250,12 +250,13 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-query.c b/src/trivial/tri-query.c index 3c6172b3..026b1d0a 100644 --- a/src/trivial/tri-query.c +++ b/src/trivial/tri-query.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -154,7 +154,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -162,5 +162,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/tri-tex-3d.c b/src/trivial/tri-tex-3d.c index 5982ebb5..fc134509 100644 --- a/src/trivial/tri-tex-3d.c +++ b/src/trivial/tri-tex-3d.c @@ -25,7 +25,7 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -162,7 +162,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -170,5 +170,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-drawarrays-2101010.c b/src/trivial/vbo-drawarrays-2101010.c index e4cf50d9..fc7b1c95 100644 --- a/src/trivial/vbo-drawarrays-2101010.c +++ b/src/trivial/vbo-drawarrays-2101010.c @@ -8,7 +8,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLboolean bgra = GL_FALSE; @@ -178,13 +178,13 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-drawarrays.c b/src/trivial/vbo-drawarrays.c index 2811c22b..3ac9de67 100644 --- a/src/trivial/vbo-drawarrays.c +++ b/src/trivial/vbo-drawarrays.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -124,11 +124,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-drawelements.c b/src/trivial/vbo-drawelements.c index cb387aea..495270af 100644 --- a/src/trivial/vbo-drawelements.c +++ b/src/trivial/vbo-drawelements.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" struct { @@ -128,11 +128,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-drawrange.c b/src/trivial/vbo-drawrange.c index 90260a4c..84941ecd 100644 --- a/src/trivial/vbo-drawrange.c +++ b/src/trivial/vbo-drawrange.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" #define ELTOBJ 0 @@ -136,11 +136,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-noninterleaved.c b/src/trivial/vbo-noninterleaved.c index 5a67e71a..7937778c 100644 --- a/src/trivial/vbo-noninterleaved.c +++ b/src/trivial/vbo-noninterleaved.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -129,11 +129,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vbo-tri.c b/src/trivial/vbo-tri.c index 70bd35ed..ea807736 100644 --- a/src/trivial/vbo-tri.c +++ b/src/trivial/vbo-tri.c @@ -7,7 +7,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -121,11 +121,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-array-hf.c b/src/trivial/vp-array-hf.c index 7eefb96a..d638c0c9 100644 --- a/src/trivial/vp-array-hf.c +++ b/src/trivial/vp-array-hf.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" typedef union { GLfloat f; GLint i; } fi_type; @@ -205,11 +205,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-array-int.c b/src/trivial/vp-array-int.c index d84574ab..ba97c32b 100644 --- a/src/trivial/vp-array-int.c +++ b/src/trivial/vp-array-int.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLint verts[][4] = { @@ -108,11 +108,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-array.c b/src/trivial/vp-array.c index bb50d39d..ce6c4475 100644 --- a/src/trivial/vp-array.c +++ b/src/trivial/vp-array.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" GLfloat verts[][4] = { @@ -108,11 +108,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-clip.c b/src/trivial/vp-clip.c index 6151d1db..e0f30386 100644 --- a/src/trivial/vp-clip.c +++ b/src/trivial/vp-clip.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -93,11 +93,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-line-clip.c b/src/trivial/vp-line-clip.c index 5220663e..d34506da 100644 --- a/src/trivial/vp-line-clip.c +++ b/src/trivial/vp-line-clip.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -107,11 +107,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-cb-pos.c b/src/trivial/vp-tri-cb-pos.c index 49fe7a85..1a1db7d4 100644 --- a/src/trivial/vp-tri-cb-pos.c +++ b/src/trivial/vp-tri-cb-pos.c @@ -5,7 +5,7 @@ #include <string.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -146,7 +146,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -154,5 +154,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-cb-tex.c b/src/trivial/vp-tri-cb-tex.c index 08217eae..6abec341 100644 --- a/src/trivial/vp-tri-cb-tex.c +++ b/src/trivial/vp-tri-cb-tex.c @@ -5,7 +5,7 @@ #include <string.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -179,7 +179,7 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); @@ -187,5 +187,6 @@ int main(int argc, char **argv) glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-cb.c b/src/trivial/vp-tri-cb.c index 19e1d2a2..f68775a4 100644 --- a/src/trivial/vp-tri-cb.c +++ b/src/trivial/vp-tri-cb.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -98,11 +98,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-imm.c b/src/trivial/vp-tri-imm.c index cb93c9c6..8b0c84bd 100644 --- a/src/trivial/vp-tri-imm.c +++ b/src/trivial/vp-tri-imm.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -92,11 +92,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-invariant.c b/src/trivial/vp-tri-invariant.c index 39d1bc01..45de16aa 100644 --- a/src/trivial/vp-tri-invariant.c +++ b/src/trivial/vp-tri-invariant.c @@ -4,7 +4,7 @@ #include <string.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" @@ -136,12 +136,13 @@ int main(int argc, char **argv) exit(1); } - gladLoadGL(); + gladLoaderLoadGL(); Init(); glutReshapeFunc(Reshape); glutKeyboardFunc(Key); glutDisplayFunc(Draw); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-swap.c b/src/trivial/vp-tri-swap.c index 82dcf3ff..938b797e 100644 --- a/src/trivial/vp-tri-swap.c +++ b/src/trivial/vp-tri-swap.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -94,11 +94,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri-tex.c b/src/trivial/vp-tri-tex.c index 7b4150cd..b49f0465 100644 --- a/src/trivial/vp-tri-tex.c +++ b/src/trivial/vp-tri-tex.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -128,11 +128,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_DEPTH | GLUT_RGB | GLUT_SINGLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-tri.c b/src/trivial/vp-tri.c index 9ec66db0..f3f9121f 100644 --- a/src/trivial/vp-tri.c +++ b/src/trivial/vp-tri.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -95,11 +95,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } diff --git a/src/trivial/vp-unfilled.c b/src/trivial/vp-unfilled.c index 669e282f..bd288c82 100644 --- a/src/trivial/vp-unfilled.c +++ b/src/trivial/vp-unfilled.c @@ -5,7 +5,7 @@ #include <stdio.h> #include <stdlib.h> #include <math.h> -#include <glad/glad.h> +#include "glad/gl.h" #include "glut_wrap.h" static void Init( void ) @@ -95,11 +95,12 @@ int main( int argc, char *argv[] ) glutInitWindowSize( 250, 250 ); glutInitDisplayMode( GLUT_RGB | GLUT_SINGLE | GLUT_DEPTH ); glutCreateWindow(argv[0]); - gladLoadGL(); + gladLoaderLoadGL(); glutReshapeFunc( Reshape ); glutKeyboardFunc( Key ); glutDisplayFunc( Display ); Init(); glutMainLoop(); + gladLoaderUnloadGL(); return 0; } |