OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-04 18:06:22 +03:00
Code Packages Releases Activity

0031375: Visualization, TKOpenGl - suppress warning on WebGL 1.0

Browse Source 
Check for WebGL version in advance.
This commit is contained in:
kgv 2020-02-17 13:59:58 +03:00
parent cd43c08f2b
commit c64efd9e30
1 changed files with 35 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/OpenGl/OpenGl_Context.cxx
View File

@ -1044,32 +1044,47 @@ void OpenGl_Context::ReadGlVersion (Standard_Integer& theGlVerMajor,
theGlVerMajor = 0; theGlVerMajor = 0;
theGlVerMinor = 0; theGlVerMinor = 0;
#ifdef GL_MAJOR_VERSION bool toCheckVer3 = true;
// available since OpenGL 3.0 and OpenGL 3.0 ES #if defined(__EMSCRIPTEN__)
GLint aMajor = 0, aMinor = 0; // WebGL 1.0 prints annoying invalid enumeration warnings to console.
glGetIntegerv (GL_MAJOR_VERSION, &aMajor); toCheckVer3 = false;
glGetIntegerv (GL_MINOR_VERSION, &aMinor); if (EMSCRIPTEN_WEBGL_CONTEXT_HANDLE aWebGlCtx = emscripten_webgl_get_current_context())
// glGetError() sometimes does not report an error here even if
// GL does not know GL_MAJOR_VERSION and GL_MINOR_VERSION constants.
// This happens on some renderers like e.g. Cygwin MESA.
// Thus checking additionally if GL has put anything to
// the output variables.
if (::glGetError() == GL_NO_ERROR && aMajor != 0 && aMinor != 0)
{ {
theGlVerMajor = aMajor; EmscriptenWebGLContextAttributes anAttribs = {};
theGlVerMinor = aMinor; if (emscripten_webgl_get_context_attributes (aWebGlCtx, &anAttribs) == EMSCRIPTEN_RESULT_SUCCESS)
return;
}
for (GLenum anErr = ::glGetError(), aPrevErr = GL_NO_ERROR;; aPrevErr = anErr, anErr = ::glGetError())
{
if (anErr == GL_NO_ERROR
|| anErr == aPrevErr)
{ {
break; toCheckVer3 = anAttribs.majorVersion >= 2;
} }
} }
#endif #endif
// Available since OpenGL 3.0 and OpenGL ES 3.0.
if (toCheckVer3)
{
GLint aMajor = 0, aMinor = 0;
glGetIntegerv (GL_MAJOR_VERSION, &aMajor);
glGetIntegerv (GL_MINOR_VERSION, &aMinor);
// glGetError() sometimes does not report an error here even if
// GL does not know GL_MAJOR_VERSION and GL_MINOR_VERSION constants.
// This happens on some renderers like e.g. Cygwin MESA.
// Thus checking additionally if GL has put anything to
// the output variables.
if (::glGetError() == GL_NO_ERROR && aMajor != 0 && aMinor != 0)
{
theGlVerMajor = aMajor;
theGlVerMinor = aMinor;
return;
}
for (GLenum anErr = ::glGetError(), aPrevErr = GL_NO_ERROR;; aPrevErr = anErr, anErr = ::glGetError())
{
if (anErr == GL_NO_ERROR
|| anErr == aPrevErr)
{
break;
}
}
}
// Read version string. // Read version string.
// Notice that only first two numbers split by point '2.1 XXXXX' are significant. // Notice that only first two numbers split by point '2.1 XXXXX' are significant.
// Following trash (after space) is vendor-specific. // Following trash (after space) is vendor-specific.