[vlc-commits] gl_common: disable GL_ASSERT_NOERROR in release

Alexandre Janniaux git at videolan.org
Mon Feb 15 15:06:12 UTC 2021


vlc | branch: master | Alexandre Janniaux <ajanni at videolabs.io> | Fri Feb  5 10:36:40 2021 +0100| [dca989173cf9fe355897662acd323735b37b1fcc] | committer: Alexandre Janniaux

gl_common: disable GL_ASSERT_NOERROR in release

...and remove the obsolete comment, the cases have been fixed and should
be fixed if it happens again.

We don't need "proper event handling" as most errors are coming from
programmation errors, except in a few tests (like 16bit texture test)
which have been fixed already.

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

 modules/video_output/opengl/gl_common.h | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/modules/video_output/opengl/gl_common.h b/modules/video_output/opengl/gl_common.h
index 198e1b8e0b..90bfc0fb13 100644
--- a/modules/video_output/opengl/gl_common.h
+++ b/modules/video_output/opengl/gl_common.h
@@ -160,12 +160,7 @@
 # define APIENTRY
 #endif
 
-/* 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
- */
-#if 0
+#ifndef NDEBUG
 # define HAVE_GL_ASSERT_NOERROR
 #endif
 



More information about the vlc-commits mailing list