[FFmpeg-devel] [PATCH] Add extra const to FF_PFNGLSHADERSOURCEPROC.

[Billy O'Neal (VC AIR)]

Assigning the non-const version to the const version is valid (at least, builds on other platforms succeeded).

Would you still like Apple guards? (I'm hesitating only because most upstreams ask for minimal preprocessor use)

Thanks for the consideration!

Get Outlook for Android<https://aka.ms/AAb9ysg>
________________________________
From: ffmpeg-devel <ffmpeg-devel-bounces at ffmpeg.org> on behalf of Andreas Rheinhardt <andreas.rheinhardt at outlook.com>
Sent: Friday, May 31, 2024 5:30:49 PM
To: ffmpeg-devel at ffmpeg.org <ffmpeg-devel at ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] Add extra const to FF_PFNGLSHADERSOURCEPROC.

[You don't often get email from andreas.rheinhardt at outlook.com. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ]

Billy O'Neal (VC AIR) via ffmpeg-devel:
> Resolves the following compiler error on macOS 14.5:
>
> ```console
> /Library/Developer/CommandLineTools/SDKs/MacOSX14.4.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gl3.h:1891:21: note: 'glShaderSource' has been explicitly marked deprecated here
> GLAPI void APIENTRY glShaderSource (GLuint shader, GLsizei count, const GLchar* const *string, const GLint *length) OPENGL_DEPRECATED(10.5, 10.14);
>                     ^
> src/libavdevice/opengl_enc.c:482:27: error: incompatible function pointer types assigning to 'FF_PFNGLSHADERSOURCEPROC' (aka 'void (*)(unsigned int, int, const char **, const int *)') from 'void (GLuint, GLsizei, const GLchar *const *, const GLint *)' (aka 'void (unsigned int, int, const char *const *, const int *)') [-Wincompatible-function-pointer-types]
>     procs->glShaderSource = glShaderSource;
>                           ^ ~~~~~~~~~~~~~~
> ```
>
> Signed-off-by: Billy Robert O'Neal III <bion at microsoft.com>
> ---
>  libavdevice/opengl_enc.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavdevice/opengl_enc.c b/libavdevice/opengl_enc.c
> index 6f7a30ff9e..691bee22ad 100644
> --- a/libavdevice/opengl_enc.c
> +++ b/libavdevice/opengl_enc.c
> @@ -117,7 +117,7 @@ typedef void   (APIENTRY *FF_PFNGLATTACHSHADERPROC) (GLuint program, GLuint shad
>  typedef GLuint (APIENTRY *FF_PFNGLCREATESHADERPROC) (GLenum type);
>  typedef void   (APIENTRY *FF_PFNGLDELETESHADERPROC) (GLuint shader);
>  typedef void   (APIENTRY *FF_PFNGLCOMPILESHADERPROC) (GLuint shader);
> -typedef void   (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* *string, const GLint *length);
> +typedef void   (APIENTRY *FF_PFNGLSHADERSOURCEPROC) (GLuint shader, GLsizei count, const char* const *string, const GLint *length);
>  typedef void   (APIENTRY *FF_PFNGLGETSHADERIVPROC) (GLuint shader, GLenum pname, GLint *params);
>  typedef void   (APIENTRY *FF_PFNGLGETSHADERINFOLOGPROC) (GLuint shader, GLsizei bufSize, GLsizei *length, char *infoLog);
>

It seems that the extra const is apple-only, so this patch should be
restricted to it.

- Andreas

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
https://nam06.safelinks.protection.outlook.com/?url=https%3A%2F%2Fffmpeg.org%2Fmailman%2Flistinfo%2Fffmpeg-devel&data=05%7C02%7Cbion%40microsoft.com%7C27bd60fa36b84575501e08dc81d21fa9%7C72f988bf86f141af91ab2d7cd011db47%7C1%7C0%7C638527986685274201%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C0%7C%7C%7C&sdata=YErh%2BSO4tliFq2fkkncCsj%2BwfWAhX6n2Oilt0Jnld2c%3D&reserved=0<https://ffmpeg.org/mailman/listinfo/ffmpeg-devel>

To unsubscribe, visit link above, or email
ffmpeg-devel-request at ffmpeg.org with subject "unsubscribe".