scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-26 16:44:00 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Linux: Fixed context/init code for Mesa/i915.

Browse source
This commit is contained in:
Branimir Karadzic 2013-07-24 22:22:38 -07:00
parent a1dfd1ab0d
commit df3c562d47
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/glcontext_glx.cpp
View file

@ -39,9 +39,9 @@ namespace bgfx
int major, minor; int major, minor;
bool version = glXQueryVersion(s_display, &major, &minor); bool version = glXQueryVersion(s_display, &major, &minor);
BGFX_FATAL(version, Fatal::UnableToInitialize, "Failed to query GLX version"); BGFX_FATAL(version, Fatal::UnableToInitialize, "Failed to query GLX version");
BGFX_FATAL( (major == 1 && minor >= 3) || major > 1 BGFX_FATAL( (major == 1 && minor >= 2) || major > 1
, Fatal::UnableToInitialize , Fatal::UnableToInitialize
, "GLX version is not >=1.3 (%d.%d)." , "GLX version is not >=1.2 (%d.%d)."
, major , major
, minor , minor
); );

1
src/glimports.h
View file

@ -106,7 +106,6 @@ GL_IMPORT(false, PFNGLUNIFORMMATRIX4FVPROC, glUniformMatrix4fv);
GL_IMPORT(false, PFNGLTEXIMAGE3DPROC, glTexImage3D); GL_IMPORT(false, PFNGLTEXIMAGE3DPROC, glTexImage3D);
GL_IMPORT(false, PFNGLTEXSUBIMAGE3DPROC, glTexSubImage3D); GL_IMPORT(false, PFNGLTEXSUBIMAGE3DPROC, glTexSubImage3D);
GL_IMPORT(false, PFNGLCOPYTEXSUBIMAGE3DPROC, glCopyTexSubImage3D); GL_IMPORT(false, PFNGLCOPYTEXSUBIMAGE3DPROC, glCopyTexSubImage3D);
GL_IMPORT(false, PFNGLTEXIMAGE2DMULTISAMPLEPROC, glTexImage2DMultisample);
GL_IMPORT(false, PFNGLGENQUERIESPROC, glGenQueries); GL_IMPORT(false, PFNGLGENQUERIESPROC, glGenQueries);
GL_IMPORT(false, PFNGLDELETEQUERIESPROC, glDeleteQueries); GL_IMPORT(false, PFNGLDELETEQUERIESPROC, glDeleteQueries);

6
src/renderer_gl.cpp
View file

@ -2347,7 +2347,10 @@ namespace bgfx
GLint glGet(GLenum _pname) GLint glGet(GLenum _pname)
{ {
GLint result; GLint result;
GL_CHECK(glGetIntegerv(_pname, &result) ); glGetIntegerv(_pname, &result);
GLenum err = glGetError();
BX_WARN(0 == err, "glGetIntegerv(0x%04x, ...) failed with GL error: 0x%04x.", _pname, err);
BX_UNUSED(err);
return result; return result;
} }
@ -2481,7 +2484,6 @@ namespace bgfx
s_renderCtx.m_samplerObjectSupport = !!BGFX_CONFIG_RENDERER_OPENGLES3 s_renderCtx.m_samplerObjectSupport = !!BGFX_CONFIG_RENDERER_OPENGLES3
|| s_extension[Extension::ARB_sampler_objects].m_supported || s_extension[Extension::ARB_sampler_objects].m_supported
; ;
s_renderCtx.m_samplerObjectSupport = false;
s_renderCtx.m_programBinarySupport = !!BGFX_CONFIG_RENDERER_OPENGLES3 s_renderCtx.m_programBinarySupport = !!BGFX_CONFIG_RENDERER_OPENGLES3
|| s_extension[Extension::ARB_get_program_binary].m_supported || s_extension[Extension::ARB_get_program_binary].m_supported