Skip to content

V
vlc-gpu
Commit fc3e4b57 authored by Sebastien Zwickert's avatar Sebastien Zwickert Committed by Felix Paul Kühne
Browse files
Options

opengl: revert some cleanup. 

Signed-off-by: default avatarFelix Paul Kühne <fkuehne@videolan.org>
parent 30ae318e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
modules/video_output/opengl.c
View file @ fc3e4b57
...@@ -272,6 +272,8 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -272,6 +272,8 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
bool supports_npot = false; bool supports_npot = false;
#if USE_OPENGL_ES == 2 #if USE_OPENGL_ES == 2
supports_npot = true; supports_npot = true;
#elif defined(BROKEN_MACOS_OPENGL)
supports_npot = true;
#else #else
supports_npot |= HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot") || supports_npot |= HasExtension(extensions, "GL_APPLE_texture_2D_limited_npot") ||
HasExtension(extensions, "GL_ARB_texture_non_power_of_two"); HasExtension(extensions, "GL_ARB_texture_non_power_of_two");
...@@ -393,7 +395,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt, ...@@ -393,7 +395,7 @@ vout_display_opengl_t *vout_display_opengl_New(video_format_t *fmt,
*fmt = vgl->fmt; *fmt = vgl->fmt;
if (subpicture_chromas) { if (subpicture_chromas) {
*subpicture_chromas = NULL; *subpicture_chromas = NULL;
#if !USE_OPENGL_ES #if !defined(BROKEN_MACOS_OPENGL) && !USE_OPENGL_ES
if (supports_npot) if (supports_npot)
*subpicture_chromas = gl_subpicture_chromas; *subpicture_chromas = gl_subpicture_chromas;
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment