Remove some unused and unnecessary things

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 7682347ff1cf1962b411b36f146ca146c71d3b31..2366ec5ce0dd3269ee13db7d80bd53eade0fd565 100644 (file)
--- a/source/core/buffer.h
+++ b/source/core/buffer.h
@@ -15,8 +15,6 @@ public:
        virtual ~buffer_too_small() throw() { }
 };
 
-class BufferRange;
-
 /**
 A buffer for storing data in GL memory.  Putting vertex and index data in
 buffers can improve rendering performance.  The VertexArray, Mesh and

diff --git a/source/core/bufferable.cpp b/source/core/bufferable.cpp
index 24c0f2789f4bae1bf256237587509ff40c408e68..0a480e2527cfabbdf24241508d089acb5e8bd726 100644 (file)
--- a/source/core/bufferable.cpp
+++ b/source/core/bufferable.cpp
@@ -114,7 +114,6 @@ void Bufferable::upload_data(char *target) const
        if(location_dirty)
        {
                buffer->require_size(offset+data_size);
-               location_changed(buffer, offset, data_size);
                location_dirty = false;
        }
 

diff --git a/source/core/bufferable.h b/source/core/bufferable.h
index b1d991fca5218cfd4a0cd1e7ee554d2920a02463..c40c891e3ce342edece4a1ebf5dca74c45c22693 100644 (file)
--- a/source/core/bufferable.h
+++ b/source/core/bufferable.h
@@ -87,9 +87,6 @@ public:
        unsigned get_offset() const { return offset; }
 
 private:
-       /** Called when the target buffer or offset within it has changed. */
-       virtual void location_changed(Buffer *, unsigned, unsigned) const { }
-
        /** Uploads data to the buffer.  Receives pointer to mapped buffer memory as
        parameter, or null to use the buffer upload interface. */
        void upload_data(char *) const;

diff --git a/source/core/texture1d.h b/source/core/texture1d.h
index 04284697732784fc9ce9b84c1279d7bd40180665..3823513d8c51c2d201017e39450527e043330826 100644 (file)
--- a/source/core/texture1d.h
+++ b/source/core/texture1d.h
@@ -35,7 +35,7 @@ public:
        void image(unsigned, const void *);
        void sub_image(unsigned, int, unsigned, const void *);
        virtual void image(const Graphics::Image &, unsigned = 0);
-       using Texture::image;
+
        unsigned get_width() const { return width; }
 
 private:

diff --git a/source/core/texture2d.h b/source/core/texture2d.h
index 209cede5843535a40b888c872f6be88909fd8436..6ae600e767acc2c7999d6523eba964db2d542f74 100644 (file)
--- a/source/core/texture2d.h
+++ b/source/core/texture2d.h
@@ -61,8 +61,6 @@ public:
        image must match the defined storage. */
        virtual void image(const Graphics::Image &, unsigned lv = 0);
 
-       using Texture::image;
-
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
 

diff --git a/source/core/texture3d.h b/source/core/texture3d.h
index 4a166174fbf75fb30bb8800ca3a3017c1ef5b43f..2498c52658e3279a2dc5cfcbff93e00ccbd05984 100644 (file)
--- a/source/core/texture3d.h
+++ b/source/core/texture3d.h
@@ -64,8 +64,6 @@ public:
        storage. */
        virtual void image(const Graphics::Image &, unsigned = 0);
 
-       using Texture::image;
-
        unsigned get_width() const { return width; }
        unsigned get_height() const { return height; }
        unsigned get_depth() const { return depth; }

diff --git a/source/core/texturecube.h b/source/core/texturecube.h
index 2f445919ba718ad97d3cda995fc4cc2aba25ce7a..e5a0d04f554f6586f5a3552b96c039bb21bccce1 100644 (file)
--- a/source/core/texturecube.h
+++ b/source/core/texturecube.h
@@ -78,7 +78,6 @@ public:
        void image(TextureCubeFace, const Graphics::Image &);
 
        virtual void image(const Graphics::Image &, unsigned = 0);
-       using Texture::image;
 
        unsigned get_size() const { return size; }
 private:

diff --git a/source/render/orderedscene.h b/source/render/orderedscene.h
index e4a35afae594c1fd09ce9ded5889f9c3e920b963..be17e2206e3451b6ac214d754ddca28fc66ed3d9 100644 (file)
--- a/source/render/orderedscene.h
+++ b/source/render/orderedscene.h
@@ -29,7 +29,6 @@ public:
        virtual void setup_frame(Renderer &);
        virtual void finish_frame();
 
-       using Scene::render;
        virtual void render(Renderer &, Tag = Tag()) const;
 };