Check the flat qualifier from the correct member

[libs/gl.git] / source / core / primitivetype.cpp

diff --git a/source/core/primitivetype.cpp b/source/core/primitivetype.cpp
index 848da8000d786ee26d05d8007453e90437bdac7b..ed4b154561aa0b276d5010d5d7508a27dfe82002 100644 (file)
--- a/source/core/primitivetype.cpp
+++ b/source/core/primitivetype.cpp
@@ -6,29 +6,12 @@ using namespace std;
 namespace Msp {
 namespace GL {
 
-GLenum 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")
@@ -37,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()));
 }