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

From Tim More and Robert Osfield, implementation of ARB_timer_query based GPU timing stats syncronization.

Browse Source 
Initial email from Tim : "I've implemented using a timestamp, available with ARB_timer_query and OpenGL 3.3, to gather GPU stats. This is nice because it can accurately fix the GPU draw time with respect to the other times on the stats graph, rather than having to estimate the wall time of the end of GPU drawing. This also prevents anomalies like the GPU phase starting before the draw phase..."
Changes to Tim's submission by Robert:  Removal of need for swap buffer callback in ViewerBase.cpp, by
integrating a osg::State::frameCompleted() method that does the stats timing collection.  Introduction of a
GraphicsContext::swapBuffersCallbackOrImplementation() method that calls the State::frameCompleted() and
the swap buffers callback or the swapImplementation as required.
This commit is contained in:
Robert Osfield
2010-11-10 16:58:58 +00:00
parent 40c6d99c15
commit 68f37c4dcb
9 changed files with 352 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
include/osg/GraphicsContext
View File

@@ -392,6 +392,34 @@ class OSG_EXPORT GraphicsContext : public Object
* Pure virtual - must be implemented by concrete implementations of GraphicsContext. */
virtual void bindPBufferToTextureImplementation(GLenum buffer) = 0;
struct SwapCallback : public osg::Referenced
{
virtual void swapBuffersImplementation(GraphicsContext* gc) = 0;
};
/** Set the swap callback which overrides the
* GraphicsContext::swapBuffersImplementation(), allowing
* developers to provide custom behavior for swap.
* The callback must call
* GraphicsContext::swapBuffersImplementation() */
void setSwapCallback(SwapCallback* rc) { _swapCallback = rc; }
/** Get the swap callback which overrides the GraphicsContext::swapBuffersImplementation().*/
SwapCallback* getSwapCallback() { return _swapCallback.get(); }
/** Get the const swap callback which overrides the GraphicsContext::swapBuffersImplementation().*/
const SwapCallback* getSwapCallback() const { return _swapCallback.get(); }
/** convinience method for handling whether to call swapbuffers callback or the standard context swapBuffersImplementation.
* swapBuffersCallbackOrImplemenation() is called by swapBuffers() and osg::SwapBuffersOperation, end users should normally
* call swapBuffers() rather than swapBuffersCallbackOrImplemenation(). */
void swapBuffersCallbackOrImplemenation()
{
if (_state.valid()) _state->frameCompleted();
if (_swapCallback.valid()) _swapCallback->swapBuffersImplementation(this);
else swapBuffersImplementation();
}
/** Swap the front and back buffers implementation.
* Pure virtual - must be implemented by concrete implementations of GraphicsContext. */
virtual void swapBuffersImplementation() = 0;
@@ -411,14 +439,14 @@ class OSG_EXPORT GraphicsContext : public Object
virtual void resizedImplementation(GraphicsContext* gc, int x, int y, int width, int height) = 0;
};
/** Set the resized callback which overrides the GraphicsContext::resizedImplementation(), allow developers to provide custom behavior
/** Set the resized callback which overrides the GraphicsConext::realizedImplementation(), allow developers to provide custom behavior
* in response to a window being resized.*/
void setResizedCallback(ResizedCallback* rc) { _resizedCallback = rc; }
/** Get the resized callback which overrides the GraphicsContext::resizedImplementation().*/
/** Get the resized callback which overrides the GraphicsConext::realizedImplementation().*/
ResizedCallback* getResizedCallback() { return _resizedCallback.get(); }
/** Get the const resized callback which overrides the GraphicsContext::resizedImplementation().*/
/** Get the const resized callback which overrides the GraphicsConext::realizedImplementation().*/
const ResizedCallback* getResizedCallback() const { return _resizedCallback.get(); }
/** resized implementation, by default resizes the viewports and aspect ratios the cameras associated with the graphics Window. */
@@ -479,6 +507,7 @@ class OSG_EXPORT GraphicsContext : public Object
ref_ptr<GraphicsThread> _graphicsThread;
ref_ptr<ResizedCallback> _resizedCallback;
ref_ptr<SwapCallback> _swapCallback;
Timer_t _lastClearTick;
};