Introduced new osg::PatchParameter StateAttribute class to wrap up glPatchParameter associated state.

Note, osg::Program::setParameter(GL_PATCH_VERTICES,num); is nolonger support and should be replaced by using the new PatchParameter class.

include/osg/PatchParameter

@@ -0,0 +1,88 @@
+/* -*-c++-*- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
+ *
+ * This library is open source and may be redistributed and/or modified under
+ * the terms of the OpenSceneGraph Public License (OSGPL) version 0.0 or
+ * (at your option) any later version.  The full license is in LICENSE file
+ * included with this distribution, and on the openscenegraph.org website.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * OpenSceneGraph Public License for more details.
+*/
+
+#ifndef OSG_PATCHPARAMETER
+#define OSG_PATCHPARAMETER 1
+
+#include <osg/Vec2>
+#include <osg/Vec4>
+#include <osg/StateAttribute>
+#include <osg/GL2Extensions>
+
+namespace osg {
+
+/** Class which encapsulates glPatchParameter(..).
+*/
+class OSG_EXPORT PatchParameter : public StateAttribute
+{
+    public :
+
+        PatchParameter(GLint vertices=3);
+
+        /** Copy constructor using CopyOp to manage deep vs shallow copy.*/
+        PatchParameter(const PatchParameter& rhs,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
+            StateAttribute(rhs,copyop),
+            _vertices(rhs._vertices),
+            _patchDefaultInnerLevel(rhs._patchDefaultInnerLevel),
+            _patchDefaultOuterLevel(rhs._patchDefaultOuterLevel) {}
+
+
+        META_StateAttribute(osg, PatchParameter, PATCH_PARAMETER);
+
+        /** return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs.*/
+        virtual int compare(const StateAttribute& sa) const
+        {
+            // check the types are equal and then create the rhs variable
+            // used by the COMPARE_StateAttribute_Parameter macros below.
+            COMPARE_StateAttribute_Types(PatchParameter,sa)
+
+            // compare each parameter in turn against the rhs.
+            COMPARE_StateAttribute_Parameter(_vertices)
+            COMPARE_StateAttribute_Parameter(_patchDefaultInnerLevel)
+            COMPARE_StateAttribute_Parameter(_patchDefaultOuterLevel)
+
+            return 0; // passed all the above comparison macros, must be equal.
+        }
+
+        /** Set GL_PATCH_VERTICES parameter.*/
+        void setVertices(GLint vertices) { _vertices = vertices; }
+
+        /** Get GL_PATCH_VERTICES parameter.*/
+        GLint getVertices() const { return _vertices; }
+        
+        /** Set GL_PATCH_DEFAULT_INNER_LEVEL parameter.*/
+        void setPatchDefaultInnerLevel(const osg::Vec2& level) { _patchDefaultInnerLevel = level; }
+
+        /** Get GL_PATCH_DEFAULT_INNER_LEVEL parameter.*/
+        const osg::Vec2& getPatchDefaultInnerLevel() const { return _patchDefaultInnerLevel; }
+        
+        /** Set GL_PATCH_DEFAULT_OUTER_LEVEL parameter.*/
+        void setPatchDefaultOuterLevel(const osg::Vec4& level) { _patchDefaultOuterLevel = level; }
+
+        /** Get GL_PATCH_DEFAULT_INNER_LEVEL parameter.*/
+        const osg::Vec4& getPatchDefaultOuterLevel() const { return _patchDefaultOuterLevel; }
+
+        virtual void apply(State& state) const;
+
+    protected:
+
+        virtual ~PatchParameter();
+
+        GLint           _vertices;
+        osg::Vec2       _patchDefaultInnerLevel;
+        osg::Vec4       _patchDefaultOuterLevel;
+};
+
+}
+
+#endif

include/osg/Program

@@ -99,9 +99,6 @@ class OSG_EXPORT Program : public osg::StateAttribute
         void setParameter( GLenum pname, GLint value );
         GLint getParameter( GLenum pname ) const;
 
-        void setParameterfv( GLenum pname, const GLfloat* value );
-        const GLfloat* getParameterfv( GLenum pname ) const;
-        
         /** Set/get compute shader work groups */
         void setComputeGroups( GLint numGroupsX, GLint numGroupsY, GLint numGroupsZ );
         void getComputeGroups( GLint& numGroupsX, GLint& numGroupsY, GLint& numGroupsZ ) const;
@@ -385,13 +382,6 @@ class OSG_EXPORT Program : public osg::StateAttribute
         GLint _geometryInputType;
         GLint _geometryOutputType;
 
-        /** Parameter maintained with glPatchParameteri */
-        GLint _patchVertices;
-
-        /** Parameter maintained with glPatchParameterfv */
-        // todo add tessellation default level
-        //GLfloat _patchDefaultInnerLevel[2];
-        //GLfloat _patchDefaultOuterLevel[4];
         
         /** Parameter maintained with glDispatchCompute */
         GLint _numGroupsX;

include/osg/StateAttribute

@@ -190,7 +190,9 @@ class OSG_EXPORT StateAttribute : public Object
             UNIFORMBUFFERBINDING,
             TRANSFORMFEEDBACKBUFFERBINDING,
 
-            ATOMICCOUNTERBUFFERBINDING
+            ATOMICCOUNTERBUFFERBINDING,
+            
+            PATCH_PARAMETER
         };
 
         /** Simple pairing between an attribute type and the member within that attribute type group.*/