Remove some obsolete things

diff --git a/source/core/batch.cpp b/source/core/batch.cpp
index 2be5cc3a69ffacd2472f2575da0b480db37b3989..1469ab110ee61d1ec69c37616f43ed310d3315e5 100644 (file)
--- a/source/core/batch.cpp
+++ b/source/core/batch.cpp
@@ -48,15 +48,12 @@ void shrink(vector<Msp::UInt8> &data)
 namespace Msp {
 namespace GL {
 
-unsigned Batch::restart_index = 0;
-
 Batch::Batch(PrimitiveType t):
        prim_type(t),
        gl_prim_type(GL::get_gl_primitive_type(prim_type)),
        index_type(UNSIGNED_SHORT),
        gl_index_type(get_gl_type(index_type)),
-       max_index(0),
-       restart(false)
+       max_index(0)
 { }
 
 Batch::~Batch()
@@ -134,7 +131,6 @@ Batch &Batch::append(const Batch &other)
                ;
        else if(MSP_primitive_restart)
        {
-               restart = true;
                if(index_type==UNSIGNED_INT)
                        ::append<UInt32>(data, 0xFFFFFFFF);
                else

diff --git a/source/core/batch.h b/source/core/batch.h
index c2107f823c2907a28cf36e79b2c6190cdc486a1b..f551a5e9fb0952049018d3984beb29835f8fcaf1 100644 (file)
--- a/source/core/batch.h
+++ b/source/core/batch.h
@@ -38,9 +38,6 @@ private:
        GLenum gl_index_type;
        std::vector<UInt8> data;
        unsigned max_index;
-       bool restart;
-
-       static unsigned restart_index;
 
 public:
        Batch(PrimitiveType t);

diff --git a/source/core/texture.h b/source/core/texture.h
index e3697d2e712404940728085cce8b7ae0ea2818e5..3057ef36ed0ae57c84c133c836db12c35319e556 100644 (file)
--- a/source/core/texture.h
+++ b/source/core/texture.h
@@ -49,11 +49,6 @@ protected:
                void mipmap_levels(unsigned);
        };
 
-       enum ParameterMask
-       {
-               FORMAT_SWIZZLE = 512
-       };
-
        enum FormatSwizzle
        {
                NO_SWIZZLE,