Deprecated dirtyDisplayLists(), use established dirtyGLObjects() instead

src/osg/Geometry.cpp

@@ -83,7 +83,7 @@ Geometry::Geometry(const Geometry& geometry,const CopyOp& copyop):
 Geometry::~Geometry()
 {
     // do dirty here to keep the getGLObjectSizeHint() estimate on the ball
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     // no need to delete, all automatically handled by ref_ptr :-)
 }
@@ -159,7 +159,7 @@ void Geometry::setVertexArray(Array* array)
 
     _vertexArray = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
     dirtyBound();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
@@ -171,7 +171,7 @@ void Geometry::setNormalArray(Array* array, osg::Array::Binding binding)
 
     _normalArray = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
 }
@@ -182,7 +182,7 @@ void Geometry::setColorArray(Array* array, osg::Array::Binding binding)
 
     _colorArray = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
 }
@@ -193,7 +193,7 @@ void Geometry::setSecondaryColorArray(Array* array, osg::Array::Binding binding)
 
     _secondaryColorArray = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
 }
@@ -204,7 +204,7 @@ void Geometry::setFogCoordArray(Array* array, osg::Array::Binding binding)
 
     _fogCoordArray = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
 }
@@ -224,7 +224,7 @@ void Geometry::setTexCoordArray(unsigned int index,Array* array, osg::Array::Bin
 
     _texCoordList[index] = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array)
     {
@@ -248,7 +248,7 @@ void Geometry::setTexCoordArrayList(const ArrayList& arrayList)
 {
     _texCoordList = arrayList;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     /*if (_useVertexBufferObjects)*/
     {
@@ -270,7 +270,7 @@ void Geometry::setVertexAttribArray(unsigned int index, Array* array, osg::Array
 
     _vertexAttribList[index] = array;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     if (/*_useVertexBufferObjects && */array) addVertexBufferObjectIfRequired(array);
 }
@@ -291,7 +291,7 @@ void Geometry::setVertexAttribArrayList(const ArrayList& arrayList)
 {
     _vertexAttribList = arrayList;
 
-    dirtyDisplayList();
+    dirtyGLObjects();
 
     /*if (_useVertexBufferObjects)*/
     {
@@ -312,7 +312,7 @@ bool Geometry::addPrimitiveSet(PrimitiveSet* primitiveset)
         /*if (_useVertexBufferObjects)*/ addElementBufferObjectIfRequired(primitiveset);
 
         _primitives.push_back(primitiveset);
-        dirtyDisplayList();
+        dirtyGLObjects();
         dirtyBound();
         return true;
     }
@@ -328,7 +328,7 @@ bool Geometry::setPrimitiveSet(unsigned int i,PrimitiveSet* primitiveset)
         /*if (_useVertexBufferObjects)*/ addElementBufferObjectIfRequired(primitiveset);
 
         _primitives[i] = primitiveset;
-        dirtyDisplayList();
+        dirtyGLObjects();
         dirtyBound();
         return true;
     }
@@ -346,7 +346,7 @@ bool Geometry::insertPrimitiveSet(unsigned int i,PrimitiveSet* primitiveset)
         if (i<_primitives.size())
         {
             _primitives.insert(_primitives.begin()+i,primitiveset);
-            dirtyDisplayList();
+            dirtyGLObjects();
             dirtyBound();
             return true;
         }
@@ -371,7 +371,7 @@ void Geometry::setPrimitiveSetList(const PrimitiveSetList& primitives)
         }
 
     }
-    dirtyDisplayList(); dirtyBound();
+    dirtyGLObjects(); dirtyBound();
 }
 
 bool Geometry::removePrimitiveSet(unsigned int i, unsigned int numElementsToRemove)
@@ -393,7 +393,7 @@ bool Geometry::removePrimitiveSet(unsigned int i, unsigned int numElementsToRemo
             _primitives.erase(_primitives.begin()+i,_primitives.end());
         }
 
-        dirtyDisplayList();
+        dirtyGLObjects();
         dirtyBound();
         return true;
     }
@@ -1180,7 +1180,7 @@ Geometry* osg::createTexturedQuadGeometry(const Vec3& corner,const Vec3& widthVe
     if (array->getBinding() == binding) return; \
     array->setBinding(binding);\
     if (ab==3 /*osg::Geometry::BIND_PER_PRIMITIVE*/) _containsDeprecatedData = true; \
-    dirtyDisplayList();
+    dirtyGLObjects();
 
 
 #define GET_BINDING(array) (array!=0 ? static_cast<AttributeBinding>(array->getBinding()) : BIND_OFF)
@@ -1217,7 +1217,7 @@ void Geometry::setVertexAttribBinding(unsigned int index,AttributeBinding ab)
 
         _vertexAttribList[index]->setBinding(binding);
 
-        dirtyDisplayList();
+        dirtyGLObjects();
     }
     else
     {
@@ -1231,7 +1231,7 @@ void Geometry::setVertexAttribNormalize(unsigned int index,GLboolean norm)
     {
         _vertexAttribList[index]->setNormalize(norm!=GL_FALSE);
 
-        dirtyDisplayList();
+        dirtyGLObjects();
     }
 }