From f2bb1caa233930e1148613e9d5daa2c29b0fe271 Mon Sep 17 00:00:00 2001
From: Mikko Rasa <tdb@tdb.fi>
Date: Fri, 29 Oct 2021 12:22:52 +0300
Subject: [PATCH] Remove some unused and unnecessary things

---
 source/core/buffer.h         | 2 --
 source/core/bufferable.cpp   | 1 -
 source/core/bufferable.h     | 3 ---
 source/core/texture1d.h      | 2 +-
 source/core/texture2d.h      | 2 --
 source/core/texture3d.h      | 2 --
 source/core/texturecube.h    | 1 -
 source/render/orderedscene.h | 1 -
 8 files changed, 1 insertion(+), 13 deletions(-)

diff --git a/source/core/buffer.h b/source/core/buffer.h
index 7682347f..2366ec5c 100644
--- 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 24c0f278..0a480e25 100644
--- 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 b1d991fc..c40c891e 100644
--- 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 04284697..3823513d 100644
--- 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 209cede5..6ae600e7 100644
--- 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 4a166174..2498c526 100644
--- 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 2f445919..e5a0d04f 100644
--- 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 e4a35afa..be17e220 100644
--- 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;
 };
 
-- 
2.43.0