From fe85753859d3994c3d74860258be122a1bb86aa3 Mon Sep 17 00:00:00 2001 From: Wolfgang Draxinger Date: Mon, 14 Dec 2020 18:34:08 +0100 Subject: minimal example for X11 MIT-SHM with Xcb --- samples/OpenGL/compute_shader/main.c | 16 +++++++++++++++- samples/OpenGL/minimal_glsl/minimal_glsl.c | 2 +- samples/OpenGL/pocketwatch/pocketwatch.cpp | 4 +++- samples/OpenGL/x11argb_opengl_glsl/Makefile | 4 ++-- samples/OpenGL/x11argb_opengl_glsl/x11argb_opengl_glsl.c | 2 +- 5 files changed, 22 insertions(+), 6 deletions(-) (limited to 'samples/OpenGL') diff --git a/samples/OpenGL/compute_shader/main.c b/samples/OpenGL/compute_shader/main.c index c6acdc3..a519439 100644 --- a/samples/OpenGL/compute_shader/main.c +++ b/samples/OpenGL/compute_shader/main.c @@ -246,6 +246,20 @@ void gldebugcallback( fprintf(stderr, "(GL) %s\n", message); } +static +void glinfodump(void) +{ + printf( + "OpenGL vendor: %s\n" + "OpenGL renderer: %s\n" + "OpenGL version: %s\n", + " GLSL version: %s\n", + glGetString(GL_VENDOR), + glGetString(GL_RENDERER), + glGetString(GL_VERSION), + glGetString(GL_SHADING_LANGUAGE_VERSION) ); +} + int main(int argc, char *argv[]) { glutInit(&argc, argv); @@ -253,7 +267,7 @@ int main(int argc, char *argv[]) glutInitDisplayMode(GLUT_RGB | GLUT_DEPTH | GLUT_DOUBLE); glutInitWindowPosition(0,0); glutInitWindowSize(win_width, win_height); - glutCreateWindow("Compute Shader"); + glutCreateWindow("compute shader point overdraw benchmark"); if( GLEW_OK != glewInit() ) { return 1; } glDebugMessageCallback((GLDEBUGPROC)gldebugcallback, NULL); diff --git a/samples/OpenGL/minimal_glsl/minimal_glsl.c b/samples/OpenGL/minimal_glsl/minimal_glsl.c index 72ba3ff..f8599cb 100644 --- a/samples/OpenGL/minimal_glsl/minimal_glsl.c +++ b/samples/OpenGL/minimal_glsl/minimal_glsl.c @@ -1,7 +1,7 @@ #include #include #include -#include +#include static void pushModelview() { diff --git a/samples/OpenGL/pocketwatch/pocketwatch.cpp b/samples/OpenGL/pocketwatch/pocketwatch.cpp index e04ad0e..f6b49b0 100644 --- a/samples/OpenGL/pocketwatch/pocketwatch.cpp +++ b/samples/OpenGL/pocketwatch/pocketwatch.cpp @@ -14,7 +14,7 @@ void idle(); int main(int argc, char **argv) { glutInit(&argc, argv); - glutInitDisplayMode(GLUT_RGBA|GLUT_DOUBLE|GLUT_DEPTH); + glutInitDisplayMode(GLUT_RGBA|GLUT_DOUBLE|GLUT_DEPTH|GLUT_MULTISAMPLE); glutCreateWindow("PocketWatch"); glutDisplayFunc(display); @@ -37,6 +37,8 @@ void init() glLightModeli(GL_LIGHT_MODEL_LOCAL_VIEWER, GL_TRUE); glEnable(GL_LIGHTING); glEnable(GL_LIGHT0); + + glEnable(GL_MULTISAMPLE); } float light_position[]={-0.5,0.5,1,0}; diff --git a/samples/OpenGL/x11argb_opengl_glsl/Makefile b/samples/OpenGL/x11argb_opengl_glsl/Makefile index 62e3496..b5e461a 100644 --- a/samples/OpenGL/x11argb_opengl_glsl/Makefile +++ b/samples/OpenGL/x11argb_opengl_glsl/Makefile @@ -3,8 +3,8 @@ all: x11argb_opengl_glsl x11argb_opengl_glsl3 x11argb_opengl_glsl: x11argb_opengl_glsl.c Makefile - cc -std=c99 -g3 -o x11argb_opengl_glsl x11argb_opengl_glsl.c -lX11 -lXrender -lGLEW -lm + cc -std=c99 -g3 -o x11argb_opengl_glsl x11argb_opengl_glsl.c -lX11 -lXrender -lGL -lGLEW -lm x11argb_opengl_glsl3: x11argb_opengl_glsl.c Makefile - cc -std=c99 -g3 -o x11argb_opengl_glsl3 -D USE_GLX_CREATE_CONTEXT_ATTRIB x11argb_opengl_glsl.c -lX11 -lXrender -lGLEW -lm + cc -std=c99 -g3 -o x11argb_opengl_glsl3 -D USE_GLX_CREATE_CONTEXT_ATTRIB x11argb_opengl_glsl.c -lX11 -lXrender -lGL -lGLEW -lm diff --git a/samples/OpenGL/x11argb_opengl_glsl/x11argb_opengl_glsl.c b/samples/OpenGL/x11argb_opengl_glsl/x11argb_opengl_glsl.c index 7aae5a8..d64b655 100644 --- a/samples/OpenGL/x11argb_opengl_glsl/x11argb_opengl_glsl.c +++ b/samples/OpenGL/x11argb_opengl_glsl/x11argb_opengl_glsl.c @@ -365,7 +365,7 @@ static void createTheRenderContext() { GLX_CONTEXT_MAJOR_VERSION_ARB, 3, GLX_CONTEXT_MINOR_VERSION_ARB, 0, - //GLX_CONTEXT_FLAGS_ARB , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, + GLX_CONTEXT_FLAGS_ARB , GLX_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB, None }; -- cgit v1.2.3