From 97fe8e48a162b3a2197497d829a41c0739ffd593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 5 May 2018 19:28:09 -0700 Subject: [PATCH] Cleanup. --- src/glcontext_glx.cpp | 4 ---- src/renderer_gl.cpp | 2 +- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp index 5a614e40e..a489e85d1 100644 --- a/src/glcontext_glx.cpp +++ b/src/glcontext_glx.cpp @@ -152,7 +152,6 @@ namespace bgfx { namespace gl m_context = glXCreateContext( (::Display*)g_platformData.ndt, m_visualInfo, 0, GL_TRUE); BGFX_FATAL(NULL != m_context, Fatal::UnableToInitialize, "Failed to create GL 2.1 context."); -#if BGFX_CONFIG_RENDERER_OPENGL >= 31 glXCreateContextAttribsARB = (PFNGLXCREATECONTEXTATTRIBSARBPROC)glXGetProcAddress( (const GLubyte*)"glXCreateContextAttribsARB"); if (NULL != glXCreateContextAttribsARB) @@ -176,9 +175,6 @@ namespace bgfx { namespace gl m_context = context; } } -#else - BX_UNUSED(bestConfig); -#endif // BGFX_CONFIG_RENDERER_OPENGL >= 31 XUnlockDisplay( (::Display*)g_platformData.ndt); } diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp index 4da17b024..f27250d8b 100644 --- a/src/renderer_gl.cpp +++ b/src/renderer_gl.cpp @@ -4800,7 +4800,7 @@ BX_TRACE("%d, %d, %d, %s", _array, _srgb, _mipAutogen, getName(_format) ); GL_CHECK(glVertexAttribDivisor(loc, 0) ); uint32_t baseVertex = _baseVertex*_vertexDecl.m_stride + _vertexDecl.m_offset[attr]; - if ( (BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGL >= 30) || BX_ENABLED(BGFX_CONFIG_RENDERER_OPENGLES >= 31) ) + if (NULL != glVertexAttribIPointer && (AttribType::Uint8 == type || AttribType::Int16 == type) && !normalized) {