From 52e5d735ce7f327948e58db0c5f7515ebcc0258e Mon Sep 17 00:00:00 2001 From: Romain TISSERAND Date: Wed, 4 Oct 2023 14:08:53 +0200 Subject: 3rdparty/bgfx: Fixed duplicate import of GL functions on Linux when using GLES 2.0. (#11596) From bkaradzic/bgfx@66d50eb721334d6538a7eccdfdabb997667af1db Fixes build when using GLES 2.0 and Wayland. --- 3rdparty/bgfx/src/glimports.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/3rdparty/bgfx/src/glimports.h b/3rdparty/bgfx/src/glimports.h index 5a687bbf420..a462ff70861 100644 --- a/3rdparty/bgfx/src/glimports.h +++ b/3rdparty/bgfx/src/glimports.h @@ -584,6 +584,7 @@ GL_IMPORT_____x(true, PFNGLBLENDEQUATIONSEPARATEIPROC, glBlendEquati GL_IMPORT_____x(true, PFNGLBLENDFUNCIPROC, glBlendFunci); GL_IMPORT_____x(true, PFNGLBLENDFUNCSEPARATEIPROC, glBlendFuncSeparatei); +#if !BGFX_USE_GL_DYNAMIC_LIB GL_IMPORT______(true, PFNGLDRAWBUFFERPROC, glDrawBuffer); GL_IMPORT______(true, PFNGLREADBUFFERPROC, glReadBuffer); GL_IMPORT______(true, PFNGLGENSAMPLERSPROC, glGenSamplers); @@ -592,6 +593,7 @@ GL_IMPORT______(true, PFNGLBINDSAMPLERPROC, glBindSampler GL_IMPORT______(true, PFNGLSAMPLERPARAMETERFPROC, glSamplerParameterf); GL_IMPORT______(true, PFNGLSAMPLERPARAMETERIPROC, glSamplerParameteri); GL_IMPORT______(true, PFNGLSAMPLERPARAMETERFVPROC, glSamplerParameterfv); +#endif // !BGFX_USE_GL_DYNAMIC_LIB GL_IMPORT_____x(true, PFNGLBINDBUFFERBASEPROC, glBindBufferBase); GL_IMPORT_____x(true, PFNGLBINDBUFFERRANGEPROC, glBindBufferRange); -- cgit v1.2.3