Moved PROGRAMOBJECT definition into StateAttribute.

2003-07-15 16:22:29 +00:00
parent c8e7f04200
commit 47965884e9
2 changed files with 3 additions and 4 deletions
--- a/include/osg/StateAttribute
+++ b/include/osg/StateAttribute
@@ -163,7 +163,9 @@ class SG_EXPORT StateAttribute : public Object
            COLORMATRIX,
            
            VERTEXPROGRAM,
-            FRAGMENTPROGRAM
+            FRAGMENTPROGRAM,
+            
+            PROGRAMOBJECT // utilised in osgGL2/ProgramObject
        };


--- a/include/osgGL2/ProgramObject
+++ b/include/osgGL2/ProgramObject
@@ -32,9 +32,6 @@
 #include <string>


-// TODO This type enum must be officially added to osg::StateAttribute::Types
-#define PROGRAMOBJECT (osg::StateAttribute::VERTEXPROGRAM + 1)
-
 namespace osgGL2 {

 /** use deleteObject instead of glDeleteObject to allow