Clean up includes and forward declarations for the core classes

[libs/gl.git] / source / core / buffer.h

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 0d656131dd331b75ec3af57ff81581c9e2b2a3a5..df570d7eb01d2b8bae9f6115adfb2345435c4c53 100644 (file)
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -3,8 +3,6 @@
 
 #include <stdexcept>
 #include <string>
-#include <vector>
-#include "gl.h"
 
 namespace Msp {
 namespace GL {
@@ -25,10 +23,13 @@ UniformBlock classes contain built-in support for buffers.
 */
 class Buffer
 {
+       friend class PipelineState;
+       friend class Texture2D;
+       friend class VertexSetup;
+
 private:
        unsigned id;
        unsigned size;
-       bool allocated;
 
        static Buffer *scratch_binding;
 
@@ -36,17 +37,10 @@ public:
        Buffer();
        ~Buffer();
 
-       /** Returns the OpenGL ID of the buffer.  For internal use only. */
-       unsigned get_id() const { return id; }
-
        /** Defines the storage size of the buffer.  Must be called before data can
        be uploaded.  Storage cannot be changed once set. */
        void storage(unsigned);
 
-       /** Allocates storage for the buffer.  The contents are initially undefined.
-       If storage has already been allocated, does nothing. */
-       void allocate();
-
        /** Uploads data into the buffer, completely replacing any previous
        contents.  Storage must be defined beforehand.  The data must have size
        matching the defined storage. */