On 30 March 2018 at 19:52, Brian Paul <[email protected]> wrote: > This fixes a Windows build warning where the prototypes for the ES > function in the header file don't match the prototypes in this file > because the GL_API and GLAPI macros are defined differently. > > v2: defined GL_API to KEYWORD1 instead of GLAPI, per Mathias. > --- > src/mapi/glapi/glapi_dispatch.c | 7 +++++++ > 1 file changed, 7 insertions(+) > > diff --git a/src/mapi/glapi/glapi_dispatch.c b/src/mapi/glapi/glapi_dispatch.c > index 3239523..ca15449 100644 > --- a/src/mapi/glapi/glapi_dispatch.c > +++ b/src/mapi/glapi/glapi_dispatch.c > @@ -97,6 +97,13 @@ > */ > #include <GLES/glplatform.h> > > + > +/* Redefine GL_API to avoid MSVC/MinGW warnings about different dllimport > + * attributes for these prototypes vs those in the GLES/gl.h header. > + */ > +#undef GL_API > +#define GL_API KEYWORD1 > +
I realise that the patch has landed, just sharing an idea: es1_conversion.h has analogous workaround. In the long term we'd want to get the close-but-not-identical GL <> GLES (KHR really) macros. -Emil _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
