From 485315ca65cb40f33253008a79b0933997bd74f5 Mon Sep 17 00:00:00 2001 From: Mikko Rasa Date: Mon, 27 Aug 2012 23:15:23 +0300 Subject: [PATCH] Remove the global drawing functions --- source/vertexarray.cpp | 22 ---------------------- source/vertexarray.h | 17 ----------------- 2 files changed, 39 deletions(-) diff --git a/source/vertexarray.cpp b/source/vertexarray.cpp index 7716c5b2..e5e81204 100644 --- a/source/vertexarray.cpp +++ b/source/vertexarray.cpp @@ -235,27 +235,5 @@ VertexArray::Loader::Loader(VertexArray &a): add("attrib4", static_cast(&Loader::attrib)); } - -void array_element(int i) -{ - glArrayElement(i); -} - -void draw_arrays(PrimitiveType mode, int first, unsigned count) -{ - glDrawArrays(mode, first, count); -} - -void draw_elements(PrimitiveType mode, unsigned count, DataType type, const void *indices) -{ - glDrawElements(mode, count, type, indices); -} - -void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, DataType type, const void *indices) -{ - static RequireVersion _ver(1, 2); - glDrawRangeElements(mode, low, high, count, type, indices); -} - } // namespace GL } // namespace Msp diff --git a/source/vertexarray.h b/source/vertexarray.h index 7e6d04f5..6be5616e 100644 --- a/source/vertexarray.h +++ b/source/vertexarray.h @@ -73,23 +73,6 @@ private: void set_dirty(); }; -void array_element(int); -void draw_arrays(PrimitiveType, int, unsigned); -void draw_elements(PrimitiveType, unsigned, DataType, const void *); -void draw_range_elements(PrimitiveType, unsigned, unsigned, unsigned, DataType, const void *); - -inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned *indices) -{ draw_elements(mode, count, UNSIGNED_INT, indices); } - -inline void draw_elements(PrimitiveType mode, unsigned count, const unsigned short *indices) -{ draw_elements(mode, count, UNSIGNED_SHORT, indices); } - -inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned short *indices) -{ draw_range_elements(mode, low, high, count, UNSIGNED_SHORT, indices); } - -inline void draw_range_elements(PrimitiveType mode, unsigned low, unsigned high, unsigned count, const unsigned *indices) -{ draw_range_elements(mode, low, high, count, UNSIGNED_INT, indices); } - } // namespace GL } // namespace Msp -- 2.45.2