From 916693c29b9f1657410d403bb840cded70eff919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Fri, 8 May 2015 10:39:56 -0700 Subject: [PATCH] Fixed GLES 3.0+ build. --- src/glcontext_wgl.cpp | 4 ++-- src/glimports.h | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/glcontext_wgl.cpp b/src/glcontext_wgl.cpp index 23deb174..ef7f570d 100644 --- a/src/glcontext_wgl.cpp +++ b/src/glcontext_wgl.cpp @@ -188,7 +188,7 @@ namespace bgfx { namespace gl { result = wglChoosePixelFormatARB(m_hdc, attrs, NULL, 1, &m_pixelFormat, &numFormats); if (0 == result - || 0 == numFormats) + || 0 == numFormats) { attrs[3] >>= 1; attrs[1] = attrs[3] == 0 ? 0 : 1; @@ -212,7 +212,7 @@ namespace bgfx { namespace gl ); result = SetPixelFormat(m_hdc, m_pixelFormat, &m_pfd); - // When window is created by SDL and SDL_WINDOW_OPENGL is set SetPixelFormat + // When window is created by SDL and SDL_WINDOW_OPENGL is set, SetPixelFormat // will fail. Just warn and continue. In case it failed for some other reason // create context will fail and it will error out there. BX_WARN(result, "SetPixelFormat failed (last err: 0x%08x)!", GetLastError() ); diff --git a/src/glimports.h b/src/glimports.h index 3fe2527f..3cd23e97 100644 --- a/src/glimports.h +++ b/src/glimports.h @@ -563,6 +563,11 @@ GL_IMPORT______(true, PFNGLBEGINQUERYPROC, glBeginQuery) GL_IMPORT______(true, PFNGLENDQUERYPROC, glEndQuery); GL_IMPORT______(true, PFNGLGETQUERYOBJECTUI64VPROC, glGetQueryObjectui64v); +GL_IMPORT______(true, PFNGLDRAWARRAYSINDIRECTPROC, glDrawArraysIndirect); +GL_IMPORT______(true, PFNGLDRAWELEMENTSINDIRECTPROC, glDrawElementsIndirect); +GL_IMPORT______(true, PFNGLMULTIDRAWARRAYSINDIRECTPROC, glMultiDrawArraysIndirect); +GL_IMPORT______(true, PFNGLMULTIDRAWELEMENTSINDIRECTPROC, glMultiDrawElementsIndirect); + GL_IMPORT______(true, PFNGLINVALIDATEFRAMEBUFFERPROC, glInvalidateFramebuffer); # endif // BGFX_CONFIG_RENDERER_OPENGLES < 30