Unified the osg::GraphicsThread::Operation and osg::GraphicsContext::Operation classes
as osg::GraphicsOperation. Unpdated parts of OSG depending upon these. Added a virtaul bool valid() method to osg::GraphicsContext to allow apps to test whether a valid graphis context has been created or not.
This commit is contained in:
@@ -56,10 +56,10 @@ struct ThreadExitTidyUp
|
||||
|
||||
};
|
||||
|
||||
struct BlockOperation : public GraphicsThread::Operation, public Block
|
||||
struct BlockOperation : public GraphicsOperation, public Block
|
||||
{
|
||||
BlockOperation():
|
||||
GraphicsThread::Operation("Block",false)
|
||||
GraphicsOperation("Block",false)
|
||||
{
|
||||
reset();
|
||||
}
|
||||
@@ -165,7 +165,7 @@ int GraphicsThread::cancel()
|
||||
return result;
|
||||
}
|
||||
|
||||
void GraphicsThread::add(Operation* operation, bool waitForCompletion)
|
||||
void GraphicsThread::add(GraphicsOperation* operation, bool waitForCompletion)
|
||||
{
|
||||
osg::notify(osg::INFO)<<"Doing add"<<std::endl;
|
||||
|
||||
@@ -194,7 +194,7 @@ void GraphicsThread::add(Operation* operation, bool waitForCompletion)
|
||||
}
|
||||
}
|
||||
|
||||
void GraphicsThread::remove(Operation* operation)
|
||||
void GraphicsThread::remove(GraphicsOperation* operation)
|
||||
{
|
||||
osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user