[vlc-commits] opengl: disable glError() asserts

[Thomas Guillem]

vlc | branch: master | Thomas Guillem <thomas at gllm.fr> | Mon Nov  6 14:13:04 2017 +0100| [38d0199517fe94da44e95a84f142effb1d50dd13] | committer: Thomas Guillem

opengl: disable glError() asserts

Proper glError() handling needs to be implemented before enabling these
asserts.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=38d0199517fe94da44e95a84f142effb1d50dd13
---

 modules/video_output/opengl/vout_helper.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/modules/video_output/opengl/vout_helper.c b/modules/video_output/opengl/vout_helper.c
index 43ba71c129..fcd69dd477 100644
--- a/modules/video_output/opengl/vout_helper.c
+++ b/modules/video_output/opengl/vout_helper.c
@@ -49,16 +49,13 @@
 
 #define SPHERE_RADIUS 1.f
 
-#ifndef NDEBUG
-# define HAVE_GL_ASSERT_NOERROR
-#endif
-
-#ifdef __APPLE__
 /* FIXME: GL_ASSERT_NOERROR disabled for now because:
+ * Proper GL error handling need to be implemented
  * glClear(GL_COLOR_BUFFER_BIT) throws a GL_INVALID_FRAMEBUFFER_OPERATION on macOS
  * assert fails on vout_display_opengl_Delete on iOS
  */
-# undef HAVE_GL_ASSERT_NOERROR
+#if 0
+# define HAVE_GL_ASSERT_NOERROR
 #endif
 
 #ifdef HAVE_GL_ASSERT_NOERROR