]> OCCT Git - occt-copy.git/commitdiff
Revert "0028180: Visualization, TKOpenGl - Performance of Shaded presentation dropped...
authornds <nds@opencascade.com>
Sun, 22 Mar 2020 14:59:01 +0000 (17:59 +0300)
committernds <nds@opencascade.com>
Sun, 22 Mar 2020 14:59:01 +0000 (17:59 +0300)
This reverts commit 0c5aab86c5771287a836d222125e515bca4a90b1.

src/OpenGl/OpenGl_Context.cxx

index 4f78811bff598932bf9e9c12d938db92b7eaa727..86b763bf78da6de327459422f069443fe02fbdc6 100644 (file)
@@ -4058,26 +4058,13 @@ void OpenGl_Context::ApplyModelWorldMatrix()
 // =======================================================================
 void OpenGl_Context::ApplyWorldViewMatrix()
 {
-  /*if (myShaderManager->ModelWorldState().ModelWorldMatrix() != THE_IDENTITY_MATRIX)
+  if (myShaderManager->ModelWorldState().ModelWorldMatrix() != THE_IDENTITY_MATRIX)
   {
     myShaderManager->UpdateModelWorldStateTo (THE_IDENTITY_MATRIX);
   }
   if (myShaderManager->WorldViewState().WorldViewMatrix() != WorldViewState.Current())
   {
     myShaderManager->UpdateWorldViewStateTo (WorldViewState.Current());
-  }*/
-#if !defined(GL_ES_VERSION_2_0)
-  if (core11 != NULL)
-  {
-    core11->glMatrixMode (GL_MODELVIEW);
-    core11->glLoadMatrixf (WorldViewState.Current());
-  }
-#endif
-
-  if (!myShaderManager->IsEmpty())
-  {
-    myShaderManager->UpdateModelWorldStateTo (THE_IDENTITY_MATRIX);
-    myShaderManager->UpdateWorldViewStateTo (WorldViewState.Current());
   }
 }