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

Various warning fixes

Browse Source
This commit is contained in:
Robert Osfield
2008-10-27 13:09:43 +00:00
parent e062524cb4
commit b28612bce2
21 changed files with 77 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/osg/FrameBufferObject.cpp
View File

@@ -41,8 +41,7 @@ FBOExtensions* FBOExtensions::instance(unsigned contextID, bool createIfNotInita
#define LOAD_FBO_EXT(name) setGLExtensionFuncPtr(name, (#name))
FBOExtensions::FBOExtensions(unsigned int contextID)
: _supported(false),
glBindRenderbufferEXT(0),
: glBindRenderbufferEXT(0),
glGenRenderbuffersEXT(0),
glDeleteRenderbuffersEXT(0),
glRenderbufferStorageEXT(0),
@@ -58,7 +57,8 @@ FBOExtensions::FBOExtensions(unsigned int contextID)
glFramebufferTextureLayerEXT(0),
glFramebufferRenderbufferEXT(0),
glGenerateMipmapEXT(0),
glBlitFramebufferEXT(0)
glBlitFramebufferEXT(0),
_supported(false)
{
if (!isGLExtensionSupported(contextID, "GL_EXT_framebuffer_object"))
return;
@@ -661,7 +661,6 @@ FrameBufferObject::~FrameBufferObject()
void FrameBufferObject::setAttachment(BufferComponent attachment_point, const FrameBufferAttachment &attachment)
{
GLenum gl_attachment = convertBufferComponentToGLenum(attachment_point);
_attachments[attachment_point] = attachment;
updateDrawBuffers();
@@ -687,8 +686,6 @@ void FrameBufferObject::updateDrawBuffers()
// create textures and mipmaps before we bind the frame buffer object
for (AttachmentMap::const_iterator i=_attachments.begin(); i!=_attachments.end(); ++i)
{
const FrameBufferAttachment &fa = i->second;
// setup draw buffers based on the attachment definition
if (i->first >= Camera::COLOR_BUFFER0 && i->first <= Camera::COLOR_BUFFER15)
_drawBuffers.push_back(convertBufferComponentToGLenum(i->first));