Make the use of DevIL optional

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

diff --git a/source/immediate.h b/source/immediate.h
index b979973c10a859fcd3aa2203d7cf9f98b0b69ad1..7e99272bb19e7b0d925b69f62a05b09c979bf8c4 100644 (file)
--- a/source/immediate.h
+++ b/source/immediate.h
@@ -8,9 +8,7 @@ Distributed under the LGPL
 #ifndef MSP_GL_IMMEDIATE_H_
 #define MSP_GL_IMMEDIATE_H_
 
-#include "primitivetype.h"
-#include "vertexarray.h"
-#include "vertexbuilder.h"
+#include "primitivebuilder.h"
 
 namespace Msp {
 namespace GL {
@@ -22,20 +20,16 @@ end() to terminate the batch.  However, unlike OpenGL immediate mode, vertices
 are not drawn as they are specified.  Instead, they are accumulated in a
 VertexArray and drawn when end() is called.
 */
-class Immediate: public VertexBuilder
+class Immediate: public PrimitiveBuilder
 {
-public:
-       Immediate(VertexFormat);
-       void begin(PrimitiveType);
-       void end();
 private:
        VertexArray array;
-       RefPtr<VertexArrayBuilder> builder;
-       PrimitiveType type;
-       bool in_batch;
-       unsigned n_vertices;
 
-       virtual void vertex_(float, float, float, float);
+public:
+       Immediate(VertexFormat);
+private:
+       virtual void begin_() { }
+       virtual void end_();
 };
 
 } // namespace GL