0026002: Visualization, TKOpenGl - detect alien Core Profile context

Read GL_CONTEXT_PROFILE_MASK flags.

Update of unstable test-case

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index a798c3a2128aeabd0ca9b582bec891fe73996e35..fe233622e05624ca7ddec738872cd76aef44f854 100644 (file)
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -953,26 +953,19 @@ void OpenGl_Context::init (const Standard_Boolean theIsCoreProfile)
     FindProc ("glGetStringi", myFuncs->glGetStringi);
   }
 
-  // this check would not work well due to buggy NVIDIA drivers!
-  /*GLint aProfile = 0;
+  bool isCoreProfile = false;
   if (IsGlGreaterEqual (3, 2))
   {
-    ::glGetIntegerv (GL_CONTEXT_PROFILE_MASK, &aProfile);
-  }
-  const bool isCoreProfile = (aProfile & GL_CONTEXT_CORE_PROFILE_BIT) != 0;*/
+    isCoreProfile = (theIsCoreProfile == Standard_True);
 
-  // detect Core profile
-  /*for (int anErr = glGetError(), aPrevErr = GL_NO_ERROR;; aPrevErr = anErr, anErr = glGetError())
-  {
-    if (anErr == aPrevErr)
+    // detect Core profile
+    if (isCoreProfile)
     {
-      break;
+      GLint aProfile = 0;
+      ::glGetIntegerv (GL_CONTEXT_PROFILE_MASK, &aProfile);
+      isCoreProfile = (aProfile & GL_CONTEXT_CORE_PROFILE_BIT) != 0;
     }
   }
-  const char* anExtString = (const char* )::glGetString (GL_EXTENSIONS);
-  const bool isCoreProfile = IsGlGreaterEqual (3, 2) && (glGetError() != GL_NO_ERROR);*/
-
-  const bool isCoreProfile = IsGlGreaterEqual (3, 2) && theIsCoreProfile;
 #endif
 
   core11     = NULL;

diff --git a/tests/sewing/tol_100/K1 b/tests/sewing/tol_100/K1
index 4f648fc7805d360b46bb5c3b07485cf1d8b7931f..e97bd65d25df6d08e7221a57d8bf2ec23ab34d6e 100644 (file)
--- a/tests/sewing/tol_100/K1
+++ b/tests/sewing/tol_100/K1
@@ -1,4 +1,4 @@
-puts "TODO ?OCC23150 Windows: Error : Number of faults is"
+puts "TODO ?OCC23150 ALL: Error : Number of faults is"
 puts "TODO OCC24592 ALL: Error : Number of free edges is"
 
 restore [locate_data_file CNP002_projoiep.rle] a