From Colin McDonald, "Fixes for some duplicate global symbol definitions in the plugins,
which cause errors when creating a statically linked executable."
This commit is contained in:
@@ -403,6 +403,10 @@ void FrameBufferObject::apply(State &state) const
|
||||
if (_unsupported[contextID])
|
||||
return;
|
||||
|
||||
|
||||
|
||||
state.checkGLErrors("A");
|
||||
|
||||
FBOExtensions* ext = FBOExtensions::instance(contextID);
|
||||
if (!ext->isSupported())
|
||||
{
|
||||
@@ -417,6 +421,8 @@ void FrameBufferObject::apply(State &state) const
|
||||
return;
|
||||
}
|
||||
|
||||
state.checkGLErrors("B");
|
||||
|
||||
int &dirtyAttachmentList = _dirtyAttachmentList[contextID];
|
||||
|
||||
GLuint &fboID = _fboID[contextID];
|
||||
@@ -433,6 +439,8 @@ void FrameBufferObject::apply(State &state) const
|
||||
|
||||
}
|
||||
|
||||
state.checkGLErrors("C");
|
||||
|
||||
if (dirtyAttachmentList)
|
||||
{
|
||||
// create textures and mipmaps before we bind the frame buffer object
|
||||
@@ -444,8 +452,12 @@ void FrameBufferObject::apply(State &state) const
|
||||
|
||||
}
|
||||
|
||||
state.checkGLErrors("D");
|
||||
|
||||
ext->glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fboID);
|
||||
|
||||
state.checkGLErrors("E");
|
||||
|
||||
if (dirtyAttachmentList)
|
||||
{
|
||||
for (AttachmentMap::const_iterator i=_attachments.begin(); i!=_attachments.end(); ++i)
|
||||
@@ -455,6 +467,7 @@ void FrameBufferObject::apply(State &state) const
|
||||
}
|
||||
dirtyAttachmentList = 0;
|
||||
}
|
||||
state.checkGLErrors("F");
|
||||
}
|
||||
|
||||
int FrameBufferObject::compare(const StateAttribute &sa) const
|
||||
|
||||
Reference in New Issue
Block a user