OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-03 17:56:21 +03:00
Code Packages Releases Activity

0029125: Visualization, OpenGl_Text - fix access violation within OpenGL1.1 context

Browse Source 
OpenGl_Context::DiagnosticInformation() - added OpenGL version check before retrieving GL_SHADING_LANGUAGE_VERSION string.
This commit is contained in:
kgv 2017-09-19 12:53:15 +03:00 committed by bugmaster
parent 8444aedb1d
commit 048e1b3b03
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/OpenGl/OpenGl_Context.cxx
View File

@ -2816,7 +2816,10 @@ void OpenGl_Context::DiagnosticInformation (TColStd_IndexedDataMapOfStringString
addInfo (theDict, "GLvendor", (const char*)::glGetString (GL_VENDOR));
addInfo (theDict, "GLdevice", (const char*)::glGetString (GL_RENDERER));
addInfo (theDict, "GLversion", (const char*)::glGetString (GL_VERSION));
addInfo (theDict, "GLSLversion", (const char*)::glGetString (GL_SHADING_LANGUAGE_VERSION));
if (IsGlGreaterEqual (2, 0))
{
addInfo (theDict, "GLSLversion", (const char*)::glGetString (GL_SHADING_LANGUAGE_VERSION));
}
if (myIsGlDebugCtx)
{
addInfo (theDict, "GLdebug", "ON");

10
src/OpenGl/OpenGl_Text.cxx
View File

@ -22,6 +22,7 @@
#include <OpenGl_Text.hxx>
#include <OpenGl_Workspace.hxx>
#include <OpenGl_View.hxx>
#include <OpenGl_VertexBufferCompat.hxx>
#include <Font_FontMgr.hxx>
#include <Font_FTFont.hxx>
@ -720,7 +721,14 @@ void OpenGl_Text::drawRect (const Handle(OpenGl_Context)& theCtx,
OpenGl_Vec2(myBndBox.Left, myBndBox.Bottom),
OpenGl_Vec2(myBndBox.Left, myBndBox.Top)
};
myBndVertsVbo = new OpenGl_VertexBuffer();
if (theCtx->ToUseVbo())
{
myBndVertsVbo = new OpenGl_VertexBuffer();
}
else
{
myBndVertsVbo = new OpenGl_VertexBufferCompat();
}
myBndVertsVbo->Init (theCtx, 2, 4, aQuad[0].GetData());
}