From 980db2c772d30db2a82fc9cac8abc570577efb6e Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Fri, 27 Nov 2009 11:48:21 +0000
Subject: [PATCH] Updated wrappers

---
 src/osgWrappers/osg/BufferObject.cpp | 30 +++++++++++++++++++++++++---
 src/osgWrappers/osg/Texture.cpp      | 28 ++++++++++++++++++++++++++
 2 files changed, 55 insertions(+), 3 deletions(-)

diff --git a/src/osgWrappers/osg/BufferObject.cpp b/src/osgWrappers/osg/BufferObject.cpp
index 7222ba1a5..1a50f16b3 100644
--- a/src/osgWrappers/osg/BufferObject.cpp
+++ b/src/osgWrappers/osg/BufferObject.cpp
@@ -462,9 +462,13 @@ BEGIN_OBJECT_REFLECTOR(osg::GLBufferObject)
 	                __GLBufferObject_P1__createGLBufferObject__unsigned_int__C5_BufferObject_P1_S,
 	                "",
 	                "");
-	I_StaticMethod2(void, deleteBufferObject, IN, unsigned int, contextID, IN, GLuint, globj,
-	                __void__deleteBufferObject__unsigned_int__GLuint_S,
-	                "Use deleteVertexBufferObject instead of glDeleteBuffers to allow OpenGL buffer objects to be cached until they can be deleted by the OpenGL context in which they were created, specified by contextID. ",
+	I_StaticMethod1(void, deleteAllBufferObjects, IN, unsigned int, contextID,
+	                __void__deleteAllBufferObjects__unsigned_int_S,
+	                "",
+	                "");
+	I_StaticMethod1(void, discardAllBufferObjects, IN, unsigned int, contextID,
+	                __void__discardAllBufferObjects__unsigned_int_S,
+	                "",
 	                "");
 	I_StaticMethod1(void, flushAllDeletedBufferObjects, IN, unsigned int, contextID,
 	                __void__flushAllDeletedBufferObjects__unsigned_int_S,
@@ -613,6 +617,16 @@ BEGIN_OBJECT_REFLECTOR(osg::GLBufferObjectManager)
 	          __void__handlePendingOrphandedGLBufferObjects,
 	          "",
 	          "");
+	I_Method0(void, deleteAllGLBufferObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__deleteAllGLBufferObjects,
+	          "",
+	          "");
+	I_Method0(void, discardAllGLBufferObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__discardAllGLBufferObjects,
+	          "",
+	          "");
 	I_Method0(void, flushAllDeletedGLBufferObjects,
 	          Properties::NON_VIRTUAL,
 	          __void__flushAllDeletedGLBufferObjects,
@@ -750,6 +764,16 @@ BEGIN_OBJECT_REFLECTOR(osg::GLBufferObjectSet)
 	          __void__handlePendingOrphandedGLBufferObjects,
 	          "",
 	          "");
+	I_Method0(void, deleteAllGLBufferObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__deleteAllGLBufferObjects,
+	          "",
+	          "");
+	I_Method0(void, discardAllGLBufferObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__discardAllGLBufferObjects,
+	          "",
+	          "");
 	I_Method0(void, flushAllDeletedGLBufferObjects,
 	          Properties::NON_VIRTUAL,
 	          __void__flushAllDeletedGLBufferObjects,
diff --git a/src/osgWrappers/osg/Texture.cpp b/src/osgWrappers/osg/Texture.cpp
index f0570b548..ed086bb4a 100644
--- a/src/osgWrappers/osg/Texture.cpp
+++ b/src/osgWrappers/osg/Texture.cpp
@@ -497,6 +497,14 @@ BEGIN_ABSTRACT_OBJECT_REFLECTOR(osg::Texture)
 	                __unsigned_int__getMinimumNumberOfTextureObjectsToRetainInCache_S,
 	                "Get the minimum number of display lists to retain in the deleted display list cache. ",
 	                "");
+	I_StaticMethod1(void, deleteAllTextureObjects, IN, unsigned int, contextID,
+	                __void__deleteAllTextureObjects__unsigned_int_S,
+	                "",
+	                "");
+	I_StaticMethod1(void, discardAllTextureObjects, IN, unsigned int, contextID,
+	                __void__discardAllTextureObjects__unsigned_int_S,
+	                "",
+	                "");
 	I_StaticMethod1(void, flushAllDeletedTextureObjects, IN, unsigned int, contextID,
 	                __void__flushAllDeletedTextureObjects__unsigned_int_S,
 	                "",
@@ -865,6 +873,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObjectManager)
 	          __void__handlePendingOrphandedTextureObjects,
 	          "",
 	          "");
+	I_Method0(void, deleteAllTextureObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__deleteAllTextureObjects,
+	          "",
+	          "");
+	I_Method0(void, discardAllTextureObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__discardAllTextureObjects,
+	          "",
+	          "");
 	I_Method0(void, flushAllDeletedTextureObjects,
 	          Properties::NON_VIRTUAL,
 	          __void__flushAllDeletedTextureObjects,
@@ -998,6 +1016,16 @@ BEGIN_OBJECT_REFLECTOR(osg::Texture::TextureObjectSet)
 	          __void__handlePendingOrphandedTextureObjects,
 	          "",
 	          "");
+	I_Method0(void, deleteAllTextureObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__deleteAllTextureObjects,
+	          "",
+	          "");
+	I_Method0(void, discardAllTextureObjects,
+	          Properties::NON_VIRTUAL,
+	          __void__discardAllTextureObjects,
+	          "",
+	          "");
 	I_Method0(void, flushAllDeletedTextureObjects,
 	          Properties::NON_VIRTUAL,
 	          __void__flushAllDeletedTextureObjects,