Ticket #54649: gstglapi-switch-includes.diff

File gstglapi-switch-includes.diff, 1.2 KB (added by kencu (Ken), 7 years ago)

  • gst-libs/gst/gl/gstglapi.h

    old new  
    3030#pragma GCC diagnostic ignored "-Wredundant-decls"
    3131#endif
    3232
    33 /* OpenGL 2.0 for Embedded Systems */
    34 #if GST_GL_HAVE_GLES2
    35 # if GST_GL_HAVE_PLATFORM_EAGL
    36 #  include <OpenGLES/ES2/gl.h>
    37 #  include <OpenGLES/ES2/glext.h>
    38 # else
    39 #  if GST_GL_HAVE_GLES3
    40 #   include <GLES3/gl3.h>
    41 #   include <GLES3/gl3ext.h>
    42 #  else
    43 #   include <GLES2/gl2.h>
    44 #   include <GLES2/gl2ext.h>
    45 #  endif
    46 # endif
    47 # if !GST_GL_HAVE_OPENGL
    48 #  include <gst/gl/glprototypes/gstgl_gles2compat.h>
    49 # endif
    50 #endif
    51 
    5233/* OpenGL for desktop systems */
    5334#if GST_GL_HAVE_OPENGL
    5435# ifdef __APPLE__
    … …  
    6950# endif
    7051#endif
    7152
     53/* OpenGL 2.0 for Embedded Systems */
     54#if GST_GL_HAVE_GLES2
     55# if GST_GL_HAVE_PLATFORM_EAGL
     56#  include <OpenGLES/ES2/gl.h>
     57#  include <OpenGLES/ES2/glext.h>
     58# else
     59#  if GST_GL_HAVE_GLES3
     60#   include <GLES3/gl3.h>
     61#   include <GLES3/gl3ext.h>
     62#  else
     63#   include <GLES2/gl2.h>
     64#   include <GLES2/gl2ext.h>
     65#  endif
     66# endif
     67# if !GST_GL_HAVE_OPENGL
     68#  include <gst/gl/glprototypes/gstgl_gles2compat.h>
     69# endif
     70#endif
     71
    7272#ifdef __GNUC__
    7373#pragma GCC diagnostic pop
    7474#endif