[vlc-devel] [PATCH] vaapi: add typedefs for OES_EGL_image extension

[Thomas Guillem]

Indeed, it should be done only if GL_OES_EGL_image is not defined.

cf. gl headers on my distrib:

#ifndef GL_OES_EGL_image
#define GL_OES_EGL_image 1
#ifdef GL_GLEXT_PROTOTYPES
GLAPI void APIENTRY glEGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image);
GLAPI void APIENTRY glEGLImageTargetRenderbufferStorageOES (GLenum target, GLeglImageOES image);
#endif
typedef void (APIENTRYP PFNGLEGLIMAGETARGETTEXTURE2DOESPROC) (GLenum target, GLeglImageOES image);
typedef void (APIENTRYP PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC) (GLenum target, GLeglImageOES image);
#endif

On Mon, Oct 21, 2019, at 13:52, Rémi Denis-Courmont wrote:
> This will make compilation fail on older or other EGL dev headers.
> 
> Le 19 octobre 2019 15:57:07 GMT+03:00, Alexandre Janniaux <ajanni at videolabs.io> a écrit :
>> OES_EGL_image extension is an OpenGL ES extension and the typedef might
>> not be available on EGL or OpenGL extension headers.
>> 
>> As of October 19 2019, it makes compilation fail on my ArchLinux
>> because they are not defined anymore in the headers included. modules/video_output/opengl/converter_vaapi.c | 6 ++++++
>>  1 file changed, 6 insertions(+)
>> 
>> diff --git a/modules/video_output/opengl/converter_vaapi.c b/modules/video_output/opengl/converter_vaapi.c
>> index 36e3e974ec..1246b3bdb4 100644
>> --- a/modules/video_output/opengl/converter_vaapi.c
>> +++ b/modules/video_output/opengl/converter_vaapi.c
>> @@ -35,6 +35,12 @@
>>  #include "converter.h"
>>  #include "../../hw/vaapi/vlc_vaapi.h"
>> 
>> +/* From https://www.khronos.org/registry/OpenGL/extensions/OES/OES_EGL_image.txt
>> + * The extension is an OpenGL ES extension but can (and usually is) available on
>> + * OpenGL implementations. */
>> +typedef void *GLeglImageOES;
>> +typedef void (*PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)(GLenum target, GLeglImageOES image);
>> +
>>  struct priv
>>  {
>>      VADisplay vadpy;
>> --
>> 2.23.0vlc-devel mailing list
>> To unsubscribe or modify your subscription options:
>> https://mailman.videolan.org/listinfo/vlc-devel
> 
> -- 
> Envoyé de mon appareil Android avec Courriel K-9 Mail. Veuillez excuser ma brièveté. 
> _______________________________________________
> vlc-devel mailing list
> To unsubscribe or modify your subscription options:
> https://mailman.videolan.org/listinfo/vlc-devel
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mailman.videolan.org/pipermail/vlc-devel/attachments/20191021/c485bb21/attachment.html>