From bea2bcf1aa353b1dd8d1728931ef0508677bd2c6 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Thu, 16 Sep 2021 19:14:06 +0300 Subject: [PATCH] Remove some obsolete things --- source/core/batch.cpp | 6 +----- source/core/batch.h | 3 --- source/core/texture.h | 5 ----- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/source/core/batch.cpp b/source/core/batch.cpp index 2be5cc3a..1469ab11 100644 --- a/source/core/batch.cpp +++ b/source/core/batch.cpp @@ -48,15 +48,12 @@ void shrink(vector &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(data, 0xFFFFFFFF); else diff --git a/source/core/batch.h b/source/core/batch.h index c2107f82..f551a5e9 100644 --- a/source/core/batch.h +++ b/source/core/batch.h @@ -38,9 +38,6 @@ private: GLenum gl_index_type; std::vector 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 e3697d2e..3057ef36 100644 --- 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, -- 2.45.2