Fix matrix interpolation parameter calculation

[libs/gl.git] / source / primitivetype.h

diff --git a/source/primitivetype.h b/source/primitivetype.h
index 4001852575aa0a905a40ac253c1d2c1b4827de23..9e65cbf711983c9da5c6f0b79f47a22ea828ef3f 100644 (file)
--- a/source/primitivetype.h
+++ b/source/primitivetype.h
@@ -1,15 +1,9 @@
-/* $Id$
-
-This file is part of libmspgl
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
 #ifndef MSP_GL_PRIMITIVETYPE_H_
 #define MSP_GL_PRIMITIVETYPE_H_
 
-#include <istream>
-#include <GL/gl.h>
+#include <msp/strings/lexicalcast.h>
+#include <msp/gl/extensions/msp_legacy_features.h>
+#include "gl.h"
 
 namespace Msp {
 namespace GL {
@@ -24,11 +18,12 @@ enum PrimitiveType
        TRIANGLE_STRIP = GL_TRIANGLE_STRIP,
        TRIANGLE_FAN   = GL_TRIANGLE_FAN,
        QUADS          = GL_QUADS,
-       QUAD_STRIP     = GL_QUAD_STRIP,
-       POLYGON        = GL_POLYGON
+       QUAD_STRIP     = GL_QUAD_STRIP
 };
 
-std::istream &operator>>(std::istream &in, PrimitiveType &pt);
+void operator>>(const LexicalConverter &, PrimitiveType &);
+
+void require_primitive_type(PrimitiveType);
 
 } // namespace GL
 } // namespace Msp