Added Camera::dirtyAttachmentMap(), Camera::s/getAttachmentMapModified() value and usage of this in RenderStage as a new mechanism

for telling the rendering backend to update itself to reflect new values in the attachments such as new texture or image sizes.


git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14808 16af8721-9629-0410-8352-f15c8da7e697

include/osg/Camera

@@ -416,6 +416,16 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
         const BufferAttachmentMap& getBufferAttachmentMap() const { return _bufferAttachmentMap; }
 
 
+        /** Increment the _attachementMapModifiedCount so that the rendering backend will know that it needs to be updated to handle any new settings (such as format change/resizes.).*/
+        void dirtyAttachmentMap() { ++_attachmentMapModifiedCount; }
+
+        /** Set the AttachmentMapModifiedCount to a specific value.  Note, normal usage you would simply call dirtyAttachmentMap(). */
+        void setAttachmentMapModifiedCount(unsigned int v) { _attachmentMapModifiedCount = v; }
+
+        /** Get the AttachmentMapModifiedCount. */
+        unsigned int getAttachmentMapModifiedCount() const { return _attachmentMapModifiedCount; }
+
+
         /** Explicit control over implicit allocation of buffers when using FBO.
          Implicit buffers are automatically substituted when user have not attached such buffer.
 
@@ -667,6 +677,8 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
         ImplicitBufferAttachmentMask        _implicitBufferAttachmentRenderMask;
         ImplicitBufferAttachmentMask        _implicitBufferAttachmentResolveMask;
 
+        unsigned int                        _attachmentMapModifiedCount;
+
         ref_ptr<OperationThread>            _cameraThread;
 
         ref_ptr<GraphicsContext>            _graphicsContext;

include/osgUtil/RenderStage

@@ -143,6 +143,10 @@ class OSGUTIL_EXPORT RenderStage : public RenderBin
         void setCameraRequiresSetUp(bool flag) { _cameraRequiresSetUp = flag; }
         bool getCameraRequiresSetUp() const { return _cameraRequiresSetUp; }
 
+        void setCameraAttachmentMapCount(unsigned int v) { _cameraAttachmentMapModifiedCount = v; }
+        unsigned int getCameraAttachmentMapCount() { return _cameraAttachmentMapModifiedCount; }
+
+
         /** Attempt the set the RenderStage from the Camera settings.*/
         void runCameraSetUp(osg::RenderInfo& renderInfo);
 
@@ -288,6 +292,7 @@ protected:
         int                                 _clearStencil;
 
         bool                                _cameraRequiresSetUp;
+        unsigned int                        _cameraAttachmentMapModifiedCount;
         osg::observer_ptr<osg::Camera>      _camera;
 
         osg::ref_ptr<osg::Texture>              _texture;

src/osg/Camera.cpp

@@ -35,7 +35,8 @@ Camera::Camera():
     _renderTargetImplementation(FRAME_BUFFER),
     _renderTargetFallback(FRAME_BUFFER),
     _implicitBufferAttachmentRenderMask( USE_DISPLAY_SETTINGS_MASK ),
-    _implicitBufferAttachmentResolveMask( USE_DISPLAY_SETTINGS_MASK )
+    _implicitBufferAttachmentResolveMask( USE_DISPLAY_SETTINGS_MASK ),
+    _attachmentMapModifiedCount(0)
 {
     setStateSet(new StateSet);
 }
@@ -66,6 +67,7 @@ Camera::Camera(const Camera& camera,const CopyOp& copyop):
     _bufferAttachmentMap(camera._bufferAttachmentMap),
     _implicitBufferAttachmentRenderMask(camera._implicitBufferAttachmentRenderMask),
     _implicitBufferAttachmentResolveMask(camera._implicitBufferAttachmentResolveMask),
+    _attachmentMapModifiedCount(camera._attachmentMapModifiedCount),
     _initialDrawCallback(camera._initialDrawCallback),
     _preDrawCallback(camera._preDrawCallback),
     _postDrawCallback(camera._postDrawCallback),

src/osgUtil/RenderStage.cpp

@@ -53,6 +53,7 @@ RenderStage::RenderStage():
     _clearStencil = 0;
 
     _cameraRequiresSetUp = false;
+    _cameraAttachmentMapModifiedCount = 0;
     _camera = 0;
 
     _level = 0;
@@ -83,6 +84,7 @@ RenderStage::RenderStage(SortMode mode):
     _clearStencil = 0;
 
     _cameraRequiresSetUp = false;
+    _cameraAttachmentMapModifiedCount = 0;
     _camera = 0;
 
     _level = 0;
@@ -109,6 +111,7 @@ RenderStage::RenderStage(const RenderStage& rhs,const osg::CopyOp& copyop):
         _clearDepth(rhs._clearDepth),
         _clearStencil(rhs._clearStencil),
         _cameraRequiresSetUp(rhs._cameraRequiresSetUp),
+        _cameraAttachmentMapModifiedCount(rhs._cameraAttachmentMapModifiedCount),
         _camera(rhs._camera),
         _level(rhs._level),
         _face(rhs._face),
@@ -227,6 +230,10 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
 
     if (!_camera) return;
 
+    OSG_INFO<<"RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo) "<<this<<std::endl;
+
+    _cameraAttachmentMapModifiedCount = _camera->getAttachmentMapModifiedCount();
+
     osg::State& state = *renderInfo.getState();
 
     osg::Camera::RenderTargetImplementation renderTargetImplementation = _camera->getRenderTargetImplementation();
@@ -1160,7 +1167,7 @@ void RenderStage::draw(osg::RenderInfo& renderInfo,RenderLeaf*& previous)
     // so there is no need to call it here.
     drawPreRenderStages(renderInfo,previous);
 
-    if (_cameraRequiresSetUp)
+    if (_cameraRequiresSetUp || (_cameraAttachmentMapModifiedCount!=_camera->getAttachmentMapModifiedCount()))
     {
         runCameraSetUp(renderInfo);
     }