From e42a11769ed2ce842af9ad509bcd5bfb00e2a5cc Mon Sep 17 00:00:00 2001 From: =?utf8?q?Stefan=20Br=C3=BCns?= Date: Sun, 28 Jun 2020 22:13:32 +0200 Subject: [PATCH] Replace last glDrawBuffer call with glDrawBuffers(1, ...) glDrawBuffer is only available in Desktop OpenGL, while the equivalent glDrawBuffers is valid also for GLES. Just defining glDrawBuffer as an empty macro is obviously not the right solution, as the call is also required on GLES. This also causes a compilation failure - GL.h may be included via GLX.h on X11 platforms, and the glDrawBuffer prototype declaration becomes malformed. Gbp-Pq: Name 81_allow_gles_platforms.patch --- Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h | 3 ++- ThirdParty/glew/vtk_glew.h.in | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h index 56325474..ae3bd53f 100644 --- a/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h +++ b/Rendering/ContextOpenGL2/vtkOpenGLContextDevice2DPrivate.h @@ -324,7 +324,8 @@ public: if (this->SavedDrawBuffer != GL_BACK_LEFT) { - glDrawBuffer(this->SavedDrawBuffer); + const GLenum bufs[1] = { static_cast(this->SavedDrawBuffer) }; + ::glDrawBuffers(1, bufs); } ostate->vtkglClearColor(this->SavedClearColor[0], this->SavedClearColor[1], diff --git a/ThirdParty/glew/vtk_glew.h.in b/ThirdParty/glew/vtk_glew.h.in index 6aa8c2ee..6afed1d6 100644 --- a/ThirdParty/glew/vtk_glew.h.in +++ b/ThirdParty/glew/vtk_glew.h.in @@ -52,7 +52,6 @@ /* some fixes for both ES 2 and 3 */ #ifdef GL_ES_VERSION_3_0 -# define glDrawBuffer(arg) # define GL_BACK_LEFT 0 # define GL_BACK_RIGHT 0 # define GL_FRONT_LEFT 0 -- 2.30.2