diff --git a/src/glcontext_glx.cpp b/src/glcontext_glx.cpp
index 7a47f551..2f6f2245 100644
--- a/src/glcontext_glx.cpp
+++ b/src/glcontext_glx.cpp
@@ -39,9 +39,9 @@ namespace bgfx
 		int major, minor;
 		bool version = glXQueryVersion(s_display, &major, &minor);
 		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
-				, "GLX version is not >=1.3 (%d.%d)."
+				, "GLX version is not >=1.2 (%d.%d)."
 				, major
 				, minor
 				);
diff --git a/src/glimports.h b/src/glimports.h
index 7c6c1fa0..9830438d 100644
--- a/src/glimports.h
+++ b/src/glimports.h
@@ -106,7 +106,6 @@ GL_IMPORT(false, PFNGLUNIFORMMATRIX4FVPROC,               glUniformMatrix4fv);
 GL_IMPORT(false, PFNGLTEXIMAGE3DPROC,                     glTexImage3D);
 GL_IMPORT(false, PFNGLTEXSUBIMAGE3DPROC,                  glTexSubImage3D);
 GL_IMPORT(false, PFNGLCOPYTEXSUBIMAGE3DPROC,              glCopyTexSubImage3D);
-GL_IMPORT(false, PFNGLTEXIMAGE2DMULTISAMPLEPROC,          glTexImage2DMultisample);
 
 GL_IMPORT(false, PFNGLGENQUERIESPROC,                     glGenQueries);
 GL_IMPORT(false, PFNGLDELETEQUERIESPROC,                  glDeleteQueries);
diff --git a/src/renderer_gl.cpp b/src/renderer_gl.cpp
index 7f0af469..c5fe1031 100644
--- a/src/renderer_gl.cpp
+++ b/src/renderer_gl.cpp
@@ -2347,7 +2347,10 @@ namespace bgfx
 	GLint glGet(GLenum _pname)
 	{
 		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;
 	}
 
@@ -2391,7 +2394,7 @@ namespace bgfx
 		GL_GET(GL_MAX_TEXTURE_SIZE, 64);
 		GL_GET(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, 0);
 		GL_GET(GL_MAX_RENDERBUFFER_SIZE, 1);
-		
+
 		BX_TRACE("      Vendor: %s", s_renderCtx.m_vendor);
 		BX_TRACE("    Renderer: %s", s_renderCtx.m_renderer);
 		BX_TRACE("     Version: %s", s_renderCtx.m_version);
@@ -2481,7 +2484,6 @@ namespace bgfx
 		s_renderCtx.m_samplerObjectSupport = !!BGFX_CONFIG_RENDERER_OPENGLES3
 			|| s_extension[Extension::ARB_sampler_objects].m_supported
 			;
-s_renderCtx.m_samplerObjectSupport = false;
 
 		s_renderCtx.m_programBinarySupport = !!BGFX_CONFIG_RENDERER_OPENGLES3
 			|| s_extension[Extension::ARB_get_program_binary].m_supported