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

Changed BarrierOperation so that it isn't limited to jut working within GraphicsContexts.

Browse Source
This commit is contained in:
Robert Osfield
2007-07-14 09:17:18 +00:00
parent f7ce35c5ee
commit af19e71024
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/osg/GraphicsThread
View File

@@ -54,7 +54,7 @@ struct OSG_EXPORT SwapBuffersOperation : public GraphicsOperation
};
/** BarrierOperation allows one to syncronize multiple GraphicsThreads with each other.*/
struct OSG_EXPORT BarrierOperation : public GraphicsOperation, public OpenThreads::Barrier
struct OSG_EXPORT BarrierOperation : public Operation, public OpenThreads::Barrier
{
enum PreBlockOp
{
@@ -64,13 +64,13 @@ struct OSG_EXPORT BarrierOperation : public GraphicsOperation, public OpenThread
};
BarrierOperation(int numThreads, PreBlockOp op=NO_OPERATION):
GraphicsOperation("Barrier", true),
Operation("Barrier", true),
OpenThreads::Barrier(numThreads),
_preBlockOp(op) {}
virtual void release();
virtual void operator () (GraphicsContext* context);
virtual void operator () (Object* object);
PreBlockOp _preBlockOp;
};

12
src/osg/GraphicsThread.cpp
View File

@@ -58,11 +58,15 @@ void BarrierOperation::release()
Barrier::release();
}
void BarrierOperation::operator () (GraphicsContext*)
void BarrierOperation::operator () (Object* object)
{
if (_preBlockOp==GL_FLUSH) glFlush();
if (_preBlockOp==GL_FINISH) glFinish();
if (_preBlockOp!=NO_OPERATION)
{
GraphicsContext* context = dynamic_cast<GraphicsContext*>(object);
if (_preBlockOp==GL_FLUSH) glFlush();
else if (_preBlockOp==GL_FINISH) glFinish();
}
block();
}