OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-24 13:50:49 +03:00
Code Activity

025306: Visualization, TKOpenGl - support texturing within RayTracing

Browse Source 
Fix bug with overlay OpenGL text.
This commit is contained in:
dbp
2014-10-23 14:09:23 +04:00
committed by bugmaster
parent f82a9555dc
commit 25ef750e44
21 changed files with 1539 additions and 497 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/OpenGl/OpenGl_Context.cxx
View File

@@ -24,7 +24,9 @@
#include <OpenGl_ArbDbg.hxx>
#include <OpenGl_ArbFBO.hxx>
#include <OpenGl_ExtGS.hxx>
#include <OpenGl_ArbTexBindless.hxx>
#include <OpenGl_GlCore20.hxx>
#include <OpenGl_Sampler.hxx>
#include <OpenGl_ShaderManager.hxx>
#include <Message_Messenger.hxx>
@@ -79,6 +81,8 @@ OpenGl_Context::OpenGl_Context (const Handle(OpenGl_Caps)& theCaps)
core20fwd (NULL),
core32 (NULL),
core32back (NULL),
core33 (NULL),
core33back (NULL),
core41 (NULL),
core41back (NULL),
core42 (NULL),
@@ -95,8 +99,11 @@ OpenGl_Context::OpenGl_Context (const Handle(OpenGl_Caps)& theCaps)
hasHighp (Standard_True),
hasTexRGBA8(Standard_True),
#endif
arbNPTW(Standard_False),
arbNPTW (Standard_False),
arbTexRG (Standard_False),
arbTexBindless (NULL),
arbTBO (NULL),
arbTboRGB32 (Standard_False),
arbIns (NULL),
arbDbg (NULL),
arbFBO (NULL),
@@ -170,6 +177,12 @@ OpenGl_Context::~OpenGl_Context()
mySharedResources.Nullify();
myDelayed.Nullify();
// release sampler object
if (!myTexSampler.IsNull())
{
myTexSampler->Release (this);
}
#if !defined(GL_ES_VERSION_2_0)
if (arbDbg != NULL
&& caps->contextDebug
@@ -844,6 +857,8 @@ void OpenGl_Context::init()
core20fwd = NULL;
core32 = NULL;
core32back = NULL;
core33 = NULL;
core33back = NULL;
core41 = NULL;
core41back = NULL;
core42 = NULL;
@@ -853,6 +868,7 @@ void OpenGl_Context::init()
core44 = NULL;
core44back = NULL;
arbTBO = NULL;
arbTboRGB32 = Standard_False;
arbIns = NULL;
arbDbg = NULL;
arbFBO = NULL;
@@ -1723,6 +1739,7 @@ void OpenGl_Context::init()
{
arbTBO = (OpenGl_ArbTBO* )(&(*myFuncs));
}
arbTboRGB32 = CheckExtension ("GL_ARB_texture_buffer_object_rgb32");
// initialize hardware instancing extension (ARB)
if (!has31
@@ -1747,6 +1764,28 @@ void OpenGl_Context::init()
extGS = (OpenGl_ExtGS* )(&(*myFuncs));
}
// initialize bindless texture extension (ARB)
if (CheckExtension ("GL_ARB_bindless_texture")
&& FindProcShort (glGetTextureHandleARB)
&& FindProcShort (glGetTextureSamplerHandleARB)
&& FindProcShort (glMakeTextureHandleResidentARB)
&& FindProcShort (glMakeTextureHandleNonResidentARB)
&& FindProcShort (glGetImageHandleARB)
&& FindProcShort (glMakeImageHandleResidentARB)
&& FindProcShort (glMakeImageHandleNonResidentARB)
&& FindProcShort (glUniformHandleui64ARB)
&& FindProcShort (glUniformHandleui64vARB)
&& FindProcShort (glProgramUniformHandleui64ARB)
&& FindProcShort (glProgramUniformHandleui64vARB)
&& FindProcShort (glIsTextureHandleResidentARB)
&& FindProcShort (glIsImageHandleResidentARB)
&& FindProcShort (glVertexAttribL1ui64ARB)
&& FindProcShort (glVertexAttribL1ui64vARB)
&& FindProcShort (glGetVertexAttribLui64vARB))
{
arbTexBindless = (OpenGl_ArbTexBindless* )(&(*myFuncs));
}
if (!has12)
{
myGlVerMajor = 1;
@@ -1822,6 +1861,12 @@ void OpenGl_Context::init()
myGlVerMinor = 2;
return;
}
core33 = (OpenGl_GlCore33* )(&(*myFuncs));
core33back = (OpenGl_GlCore33Back* )(&(*myFuncs));
// initialize sampler object
myTexSampler = new OpenGl_Sampler();
myTexSampler->Init (*this);
if (!has40)
{
@@ -1829,6 +1874,7 @@ void OpenGl_Context::init()
myGlVerMinor = 3;
return;
}
arbTboRGB32 = Standard_True; // in core since OpenGL 4.0
if (!has41)
{