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

From Jaromir Vitek, "In attachment are another fixes for using packed depth+stencil (PDS).

Browse Source 
* When used PDS RenderStage::runCameraSetUp sets flag that FBO has already stencil,depth buffer attached. Prevents adding next depth buffer.
* Sets correct traits for p-buffer if used PDS and something goes wrong with FBO setup or p-buffer is used directly.
* Adds warning to camera if user add depth/stencil already attached through PDS.
* Sets blitMask when use blit to resolve buffer.

There is also new example with using multisampled FBO."
This commit is contained in:
Robert Osfield
2008-11-25 10:57:14 +00:00
parent 410b90334a
commit d08d778608
4 changed files with 108 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/osg/Camera.cpp
View File

@@ -255,6 +255,37 @@ void Camera::getViewMatrixAsLookAt(Vec3f& eye,Vec3f& center,Vec3f& up,float look
void Camera::attach(BufferComponent buffer, GLenum internalFormat)
{
switch(buffer)
{
case DEPTH_BUFFER:
if(_bufferAttachmentMap.find(PACKED_DEPTH_STENCIL_BUFFER) != _bufferAttachmentMap.end())
{
notify(WARN)
<< "Camera: DEPTH_BUFFER already attached as PACKED_DEPTH_STENCIL_BUFFER !"
<< std::endl;
}
break;
case STENCIL_BUFFER:
if(_bufferAttachmentMap.find(PACKED_DEPTH_STENCIL_BUFFER) != _bufferAttachmentMap.end())
{
notify(WARN)
<< "Camera: STENCIL_BUFFER already attached as PACKED_DEPTH_STENCIL_BUFFER !"
<< std::endl;
}
break;
case PACKED_DEPTH_STENCIL_BUFFER:
if(_bufferAttachmentMap.find(DEPTH_BUFFER) != _bufferAttachmentMap.end())
{
notify(WARN) << "Camera: DEPTH_BUFFER already attached !" << std::endl;
}
if(_bufferAttachmentMap.find(STENCIL_BUFFER) != _bufferAttachmentMap.end())
{
notify(WARN) << "Camera: STENCIL_BUFFER already attached !" << std::endl;
}
break;
}
_bufferAttachmentMap[buffer]._internalFormat = internalFormat;
}

18
src/osgUtil/RenderStage.cpp
View File

@@ -388,6 +388,9 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
case Camera::STENCIL_BUFFER:
internalFormat = GL_STENCIL_INDEX8_EXT;
break;
case Camera::PACKED_DEPTH_STENCIL_BUFFER:
internalFormat = GL_DEPTH_STENCIL_EXT;
break;
default:
internalFormat = GL_RGBA;
break;
@@ -401,7 +404,13 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
if (buffer==osg::Camera::DEPTH_BUFFER) depthAttached = true;
else if (buffer==osg::Camera::STENCIL_BUFFER) stencilAttached = true;
else if (buffer==osg::Camera::PACKED_DEPTH_STENCIL_BUFFER)
{
depthAttached = true;
stencilAttached = true;
}
else if (buffer>=osg::Camera::COLOR_BUFFER) colorAttached = true;
}
if (!depthAttached)
@@ -559,6 +568,13 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
stencilAttached = true;
break;
}
case(osg::Camera::PACKED_DEPTH_STENCIL_BUFFER):
{
traits->depth = 24;
depthAttached = true;
traits->stencil = 8;
stencilAttached = true;
}
case(osg::Camera::COLOR_BUFFER):
{
if (attachment._internalFormat!=GL_NONE)
@@ -862,6 +878,8 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
case Camera::STENCIL_BUFFER:
blitMask |= GL_STENCIL_BUFFER_BIT;
break;
case Camera::PACKED_DEPTH_STENCIL_BUFFER:
blitMask |= GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT;
default:
blitMask |= GL_COLOR_BUFFER_BIT;
break;