From: nds <nds@opencascade.com>
Date: Tue, 3 Mar 2020 18:57:28 +0000 (+0300)
Subject: 0028180: Visualization, TKOpenGl - Performance of Shaded presentation dropped due... 
X-Git-Url: http://git.dev.opencascade.org/gitweb/?a=commitdiff_plain;h=0c5aab86c5771287a836d222125e515bca4a90b1;p=occt-copy.git

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

reject modification for custom using in a pure openGl application.
---

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