From: nds <nds@opencascade.com>
Date: Sun, 22 Mar 2020 14:59:01 +0000 (+0300)
Subject: Revert "0028180: Visualization, TKOpenGl - Performance of Shaded presentation dropped... 
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=b36a7ac3a1b5ace51dd507ed4a2be1461330a73b;p=occt-copy.git

Revert "0028180: Visualization, TKOpenGl - Performance of Shaded presentation dropped due to FFP disabled by default"

This reverts commit 0c5aab86c5771287a836d222125e515bca4a90b1.
---

diff --git a/src/OpenGl/OpenGl_Context.cxx b/src/OpenGl/OpenGl_Context.cxx
index 4f78811bff..86b763bf78 100644
--- a/src/OpenGl/OpenGl_Context.cxx
+++ b/src/OpenGl/OpenGl_Context.cxx
@@ -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());
   }
 }