From 709a657363abee1b3092eb72f906dd87409303d3 Mon Sep 17 00:00:00 2001 From: Natalia Ermolaeva Date: Sun, 27 Jun 2021 00:56:46 +0300 Subject: [PATCH] 0032461: Visualization - expensive call of glGetTexEnviv/glTexEnvi in each render of OpenGl_Text --- src/OpenGl/OpenGl_Text.cxx | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/OpenGl/OpenGl_Text.cxx b/src/OpenGl/OpenGl_Text.cxx index 5fa52b6568..83d8b1bb8d 100644 --- a/src/OpenGl/OpenGl_Text.cxx +++ b/src/OpenGl/OpenGl_Text.cxx @@ -780,16 +780,16 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx, } #if !defined(GL_ES_VERSION_2_0) // activate texture unit - GLint aTexEnvParam = GL_REPLACE; + ////GLint aTexEnvParam = GL_REPLACE; if (theCtx->core11ffp != NULL) { theCtx->core11fwd->glDisable (GL_TEXTURE_1D); theCtx->core11fwd->glEnable (GL_TEXTURE_2D); - theCtx->core11ffp->glGetTexEnviv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &aTexEnvParam); - if (aTexEnvParam != GL_REPLACE) - { - theCtx->core11ffp->glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - } + ////theCtx->core11ffp->glGetTexEnviv (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &aTexEnvParam); + ////if (aTexEnvParam != GL_REPLACE) + ////{ + //// theCtx->core11ffp->glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + ////} } #endif @@ -860,12 +860,12 @@ void OpenGl_Text::render (const Handle(OpenGl_Context)& theCtx, theCtx->ApplyProjectionMatrix(); } -#if !defined(GL_ES_VERSION_2_0) - if (theCtx->core11ffp != NULL) - { - theCtx->core11ffp->glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, aTexEnvParam); - } -#endif +//#if !defined(GL_ES_VERSION_2_0) + //if (theCtx->core11ffp != NULL) + //{ + // theCtx->core11ffp->glTexEnvi (GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, aTexEnvParam); + //} +//#endif if (theTextAspect.Aspect()->TextDisplayType() == Aspect_TODT_DIMENSION) { -- 2.39.5