FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #51 from scrawl/occlusionqueryfix_osg

Browse Source 
From Jannik Heller, "Check for presence of occlusion query extension"
This commit is contained in:
OpenSceneGraph git mirror maintainer
2016-01-25 11:05:40 +00:00
parent 4b2912e096 9aba89c88d
commit 72cc10e309
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/osg/OcclusionQueryNode.cpp
View File

@@ -243,7 +243,7 @@ public:
virtual void deleteGLObject(GLuint globj)
{
const GLExtensions* extensions = GLExtensions::Get(_contextID,true);
if (extensions->isGlslSupported) extensions->glDeleteQueries( 1L, &globj );
if (extensions->isOcclusionQuerySupported || extensions->isARBOcclusionQuerySupported) extensions->glDeleteQueries( 1L, &globj );
}
};
@@ -285,6 +285,10 @@ QueryGeometry::drawImplementation( osg::RenderInfo& renderInfo ) const
{
unsigned int contextID = renderInfo.getState()->getContextID();
osg::GLExtensions* ext = renderInfo.getState()->get<GLExtensions>();
if (!ext->isARBOcclusionQuerySupported && !ext->isOcclusionQuerySupported)
return;
osg::Camera* cam = renderInfo.getCurrentCamera();
// Add callbacks if necessary.