X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fcore%2Fprimitivetype.cpp;h=7698e2d65e0fcf916cfb70d4ac228e60830a1f97;hp=416ebae2bff1b7d9fdd02ec64cb2a97c69c1780c;hb=HEAD;hpb=24b24e2203c776aacd9744bb947f5cf47b03d328

diff --git a/source/core/primitivetype.cpp b/source/core/primitivetype.cpp
index 416ebae2..ed4b1545 100644
--- a/source/core/primitivetype.cpp
+++ b/source/core/primitivetype.cpp
@@ -1,5 +1,4 @@
 #include <msp/strings/format.h>
-#include "gl.h"
 #include "primitivetype.h"
 
 using namespace std;
@@ -7,29 +6,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-unsigned get_gl_primitive_type(PrimitiveType pt)
-{
-	switch(pt)
-	{
-	case POINTS: return GL_POINTS;
-	case LINES: return GL_LINES;
-	case LINE_STRIP: return GL_LINE_STRIP;
-	case LINE_LOOP: return GL_LINE_LOOP;
-	case TRIANGLES: return GL_TRIANGLES;
-	case TRIANGLE_STRIP: return GL_TRIANGLE_STRIP;
-	case TRIANGLE_FAN: return GL_TRIANGLE_FAN;
-	default: throw invalid_argument("get_gl_primitive_type");
-	}
-}
-
 void operator>>(const LexicalConverter &conv, PrimitiveType &pt)
 {
 	if(conv.get()=="POINTS")
 		pt = POINTS;
 	else if(conv.get()=="LINES")
 		pt = LINES;
-	else if(conv.get()=="LINE_LOOP")
-		pt = LINE_LOOP;
 	else if(conv.get()=="LINE_STRIP")
 		pt = LINE_STRIP;
 	else if(conv.get()=="TRIANGLES")
@@ -38,6 +20,8 @@ void operator>>(const LexicalConverter &conv, PrimitiveType &pt)
 		pt = TRIANGLE_STRIP;
 	else if(conv.get()=="TRIANGLE_FAN")
 		pt = TRIANGLE_FAN;
+	else if(conv.get()=="PATCHES")
+		pt = PATCHES;
 	else
 		throw lexical_error(format("conversion of '%s' to PrimitiveType", conv.get()));
 }