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

Unified the osg::GraphicsThread::Operation and osg::GraphicsContext::Operation classes

Browse Source 
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:
Robert Osfield
2006-12-24 16:40:19 +00:00
parent 76461b3ab2
commit 39c0c2df76
10 changed files with 139 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/osg/GraphicsContext.cpp
View File

@@ -260,7 +260,7 @@ void GraphicsContext::setGraphicsThread(GraphicsThread* gt)
}
}
void GraphicsContext::add(Operation* operation)
void GraphicsContext::add(GraphicsOperation* operation)
{
osg::notify(osg::INFO)<<"Doing add"<<std::endl;
@@ -273,7 +273,7 @@ void GraphicsContext::add(Operation* operation)
_operationsBlock->set(true);
}
void GraphicsContext::remove(Operation* operation)
void GraphicsContext::remove(GraphicsOperation* operation)
{
osg::notify(osg::INFO)<<"Doing remove operation"<<std::endl;

8
src/osg/GraphicsThread.cpp
View File

@@ -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;

4
src/osgUtil/RenderStage.cpp
View File

@@ -787,10 +787,10 @@ void RenderStage::drawInner(osg::RenderInfo& renderInfo,RenderLeaf*& previous, b
}
}
struct DrawInnerOperation : public osg::GraphicsThread::Operation
struct DrawInnerOperation : public osg::GraphicsOperation
{
DrawInnerOperation(RenderStage* stage, osg::RenderInfo& renderInfo) :
osg::GraphicsThread::Operation("DrawInnerStage",false),
osg::GraphicsOperation("DrawInnerStage",false),
_stage(stage),
_renderInfo(renderInfo) {}

76
src/osgViewer/GraphicsWindowX11.cpp
View File

@@ -29,11 +29,15 @@
using namespace osgViewer;
namespace osgViewer
{
class GraphicsContextX11 : public osg::GraphicsContext
{
public:
GraphicsContextX11(osg::GraphicsContext::Traits* traits):
_valid(false),
_display(0),
_parent(0),
_window(0)
@@ -41,6 +45,8 @@ class GraphicsContextX11 : public osg::GraphicsContext
_traits = traits;
}
virtual bool valid() const { return _valid; }
/** Realise the GraphicsContext implementation,
* Pure virtual - must be implemented by concrate implementations of GraphicsContext. */
virtual bool realizeImplementation() { osg::notify(osg::NOTICE)<<"GraphicsWindow::realizeImplementation() not implemented."<<std::endl; return false; }
@@ -71,12 +77,14 @@ class GraphicsContextX11 : public osg::GraphicsContext
protected:
Display* _display;
Window _parent;
Window _window;
bool _valid;
Display* _display;
Window _parent;
Window _window;
};
}
bool GraphicsWindowX11::createVisualInfo()
{
@@ -190,7 +198,13 @@ void GraphicsWindowX11::setWindowDecoration(bool flag)
void GraphicsWindowX11::init()
{
if (!_traits || _initialized) return;
if (_initialized) return;
if (!_traits)
{
_valid = false;
return;
}
_display = XOpenDisplay(_traits->displayName().c_str());
@@ -198,7 +212,9 @@ void GraphicsWindowX11::init()
if (!_display)
{
osg::notify(osg::NOTICE)<<"Error: Unable to open display \"" << XDisplayName(_traits->displayName().c_str()) << "\". Is the DISPLAY environmental variable set?"<<std::endl;
osg::notify(osg::NOTICE)<<"Error: Unable to open display \"" << XDisplayName(_traits->displayName().c_str()) << "\"."<<std::endl;
_valid = false;
return;
}
// Query for GLX extension
@@ -209,6 +225,7 @@ void GraphicsWindowX11::init()
XCloseDisplay( _display );
_display = 0;
_valid = false;
return;
}
@@ -217,6 +234,9 @@ void GraphicsWindowX11::init()
if (!createVisualInfo())
{
osg::notify(osg::NOTICE)<<"Error: Not able to create requested visual." << std::endl;
XCloseDisplay( _display );
_display = 0;
_valid = false;
return;
}
@@ -228,6 +248,9 @@ void GraphicsWindowX11::init()
if (!_glxContext)
{
osg::notify(osg::NOTICE)<<"Error: Unable to create OpenGL graphics context."<<std::endl;
XCloseDisplay( _display );
_display = 0;
_valid = false;
return;
}
@@ -262,6 +285,10 @@ void GraphicsWindowX11::init()
if (!_window)
{
osg::notify(osg::NOTICE)<<"Error: Unable to create Window."<<std::endl;
XCloseDisplay( _display );
_display = 0;
_glxContext = 0;
_valid = false;
return;
}
@@ -323,7 +350,7 @@ void GraphicsWindowX11::init()
//osg::notify(osg::NOTICE)<<"After sync apply.x = "<<watt.x<<" watt.y="<<watt.y<<" width="<<watt.width<<" height="<<watt.height<<std::endl;
_valid = true;
_initialized = true;
}
@@ -350,6 +377,8 @@ bool GraphicsWindowX11::realizeImplementation()
void GraphicsWindowX11::makeCurrentImplementation()
{
if (!_realized) return;
// osg::notify(osg::NOTICE)<<"makeCurrentImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl;
// osg::notify(osg::NOTICE)<<" glXMakeCurrent ("<<_display<<","<<_window<<","<<_glxContext<<std::endl;
@@ -362,15 +391,18 @@ void GraphicsWindowX11::makeCurrentImplementation()
void GraphicsWindowX11::closeImplementation()
{
//glXDestroyContext(_display, _glxContext );
XDestroyWindow(_display, _window);
if (_display && _window)
{
//glXDestroyContext(_display, _glxContext );
XDestroyWindow(_display, _window);
XFlush( _display );
XSync( _display,0 );
}
XFlush( _display );
XSync( _display,0 );
_window = 0;
_parent = 0;
if(_visualInfo)
{
XFree(_visualInfo);
@@ -383,10 +415,11 @@ void GraphicsWindowX11::closeImplementation()
void GraphicsWindowX11::swapBuffersImplementation()
{
if (!_realized) return;
// osg::notify(osg::NOTICE)<<"swapBuffersImplementation "<<this<<" "<<OpenThreads::Thread::CurrentThread()<<std::endl;
// makeCurrentImplementation();
glXSwapBuffers(_display, _window);
@@ -399,6 +432,8 @@ void GraphicsWindowX11::swapBuffersImplementation()
void GraphicsWindowX11::checkEvents()
{
if (!_realized) return;
// osg::notify(osg::NOTICE)<<"Check events"<<std::endl;
while( XPending(_display) )
{
@@ -679,15 +714,14 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
}
else
{
osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\". Is the DISPLAY environmental variable set?"<<std::endl;
osg::notify(osg::NOTICE) << "A Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\""<<std::endl;
return 0;
}
}
virtual void getScreenResolution(const osg::GraphicsContext::ScreenIdentifier& si, unsigned int& width, unsigned int& height)
{
const char* displayString = si.displayName().c_str();
Display* display = XOpenDisplay(displayString);
Display* display = XOpenDisplay(si.displayName().c_str());
if(display)
{
width = DisplayWidth(display, si.screenNum);
@@ -696,7 +730,7 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
}
else
{
osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(displayString) << "\". Is the DISPLAY environmental variable set?"<<std::endl;
osg::notify(osg::NOTICE) << "Unable to open display \"" << XDisplayName(si.displayName().c_str()) << "\"."<<std::endl;
width = 0;
height = 0;
}
@@ -706,11 +740,15 @@ struct X11WindowingSystemInterface : public osg::GraphicsContext::WindowingSyste
{
if (traits->pbuffer)
{
return new GraphicsContextX11(traits);
osg::ref_ptr<osgViewer::GraphicsContextX11> pbuffer = new GraphicsContextX11(traits);
if (pbuffer->valid()) return pbuffer.release();
else return 0;
}
else
{
return new GraphicsWindowX11(traits);
osg::ref_ptr<osgViewer::GraphicsWindowX11> window = new GraphicsWindowX11(traits);
if (window->valid()) return window.release();
else return 0;
}
}

4
src/osgViewer/View.cpp
View File

@@ -168,10 +168,10 @@ void View::setUpViewAcrossAllScreens()
}
// Draw operation, that does a draw on the scene graph.
struct RenderingOperation : public osg::GraphicsContext::Operation
struct RenderingOperation : public osg::GraphicsOperation
{
RenderingOperation(osgUtil::SceneView* sceneView, osgDB::DatabasePager* databasePager):
osg::GraphicsContext::Operation("Render",true),
osg::GraphicsOperation("Render",true),
_sceneView(sceneView),
_databasePager(databasePager)
{

8
src/osgViewer/Viewer.cpp
View File

@@ -107,10 +107,10 @@ void Viewer::getContexts(Contexts& contexts)
OpenThreads::Mutex mutex;
// Compile operation, that compile OpenGL objects.
struct CompileOperation : public osg::GraphicsThread::Operation
struct CompileOperation : public osg::GraphicsOperation
{
CompileOperation(osg::Node* scene):
osg::GraphicsThread::Operation("Compile",false),
osg::GraphicsOperation("Compile",false),
_scene(scene)
{
}
@@ -136,10 +136,10 @@ struct CompileOperation : public osg::GraphicsThread::Operation
// Draw operation, that does a draw on the scene graph.
struct RunOperations : public osg::GraphicsThread::Operation
struct RunOperations : public osg::GraphicsOperation
{
RunOperations(osg::GraphicsContext* gc):
osg::GraphicsThread::Operation("RunOperation",true),
osg::GraphicsOperation("RunOperation",true),
_originalContext(gc)
{
}