diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-03-04 15:40:29 +0100 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2022-03-04 15:41:00 +0100 |
| commit | 3718effc431f5622a23c55b254153efdfe4e72c4 (patch) | |
| tree | d8a805870c6a3785022e2f52f0c3715410e29a37 /examples | |
| parent | a773fdc44bfb818f1830e9e48ba765881e68c942 (diff) | |
Add the Wayland platform to FLTK 1.4
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/OpenGL3-glut-test.cxx | 8 | ||||
| -rw-r--r-- | examples/OpenGL3test.cxx | 7 |
2 files changed, 12 insertions, 3 deletions
diff --git a/examples/OpenGL3-glut-test.cxx b/examples/OpenGL3-glut-test.cxx index 75ff3b0d1..31639b545 100644 --- a/examples/OpenGL3-glut-test.cxx +++ b/examples/OpenGL3-glut-test.cxx @@ -1,7 +1,7 @@ // // Tiny OpenGL v3 + glut demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2021 by Bill Spitzak and others. +// Copyright 1998-2022 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -14,6 +14,7 @@ // https://www.fltk.org/bugs.php // +#include <FL/Fl.H> // includes <FL/fl_config.h> #if defined(__APPLE__) # define GL_DO_NOT_WARN_IF_MULTI_GL_VERSION_HEADERS_INCLUDED 1 # include <OpenGL/gl3.h> // defines OpenGL 3.0+ functions @@ -198,7 +199,10 @@ int main (int argc, char* argv[]) glutCreateWindow("Triangle Test"); #ifndef __APPLE__ GLenum err = glewInit(); // defines pters to functions of OpenGL V 1.2 and above - if (err) Fl::error("glewInit() failed returning %u", err); +#ifdef FLTK_USE_WAYLAND + if (err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK; +#endif + if (err != GLEW_OK) Fl::error("glewInit() failed returning %u", err); fprintf(stderr, "Status: Using GLEW %s\n", glewGetString(GLEW_VERSION)); #endif int gl_version_major; diff --git a/examples/OpenGL3test.cxx b/examples/OpenGL3test.cxx index 1b7983529..08c1711a5 100644 --- a/examples/OpenGL3test.cxx +++ b/examples/OpenGL3test.cxx @@ -1,7 +1,7 @@ // // Tiny OpenGL v3 demo program for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2018 by Bill Spitzak and others. +// Copyright 1998-2022 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -146,6 +146,11 @@ public: make_current(); #ifndef __APPLE__ GLenum err = glewInit(); // defines pters to functions of OpenGL V 1.2 and above +# ifdef FLTK_USE_WAYLAND + // glewInit returns GLEW_ERROR_NO_GLX_DISPLAY with Wayland + // see https://github.com/nigels-com/glew/issues/273 + if (err == GLEW_ERROR_NO_GLX_DISPLAY) err = GLEW_OK; +# endif if (err) Fl::warning("glewInit() failed returning %u", err); else add_output("Using GLEW %s\n", glewGetString(GLEW_VERSION)); #endif |