From bcd0e98739974248e6d29f72e8b281e21fd59657 Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 22 Apr 2023 13:17:05 +0100
Subject: Test instancing automatic unmap when count is called, add some
 nodiscard

---
 gfx/gl/instanceVertices.h | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

(limited to 'gfx/gl/instanceVertices.h')

diff --git a/gfx/gl/instanceVertices.h b/gfx/gl/instanceVertices.h
index cf4f0ae..edcaef4 100644
--- a/gfx/gl/instanceVertices.h
+++ b/gfx/gl/instanceVertices.h
@@ -14,7 +14,7 @@ public:
 		allocBuffer(initialSize);
 	}
 
-	class InstanceProxy {
+	class [[nodiscard]] InstanceProxy {
 	public:
 		InstanceProxy(InstanceVertices * iv, std::size_t idx) : instances {iv}, index {idx} { }
 		InstanceProxy(InstanceProxy && other) : instances {std::exchange(other.instances, nullptr)}, index {other.index}
@@ -46,41 +46,41 @@ public:
 			return instances->at(index) = std::forward<U>(v);
 		}
 
+		[[nodiscard]]
 		operator T &()
 		{
 			return instances->at(index);
 		}
-		operator const T &() const
+		[[nodiscard]] operator const T &() const
 		{
 			return instances->at(index);
 		}
-
-		T *
+		[[nodiscard]] T *
 		get()
 		{
 			return &instances->at(index);
 		}
-		const T *
+		[[nodiscard]] const T *
 		get() const
 		{
 			return &instances->at(index);
 		}
-		T *
+		[[nodiscard]] T *
 		operator->()
 		{
 			return get();
 		}
-		const T *
+		[[nodiscard]] const T *
 		operator->() const
 		{
 			return get();
 		}
-		T &
+		[[nodiscard]] T &
 		operator*()
 		{
 			return instances->at(index);
 		}
-		const T &
+		[[nodiscard]] const T &
 		operator*() const
 		{
 			return instances->at(index);
@@ -92,7 +92,7 @@ public:
 	};
 
 	template<typename... Params>
-	InstanceProxy
+	[[nodiscard]] InstanceProxy
 	acquire(Params &&... params)
 	{
 		map();
@@ -111,14 +111,13 @@ public:
 		return InstanceProxy {this, index.size() - 1};
 	}
 
-	const auto &
+	[[nodiscard]] const auto &
 	bufferName() const
 	{
-		unmap();
 		return buffer;
 	}
 
-	auto
+	[[nodiscard]] auto
 	count() const
 	{
 		unmap();
@@ -173,7 +172,7 @@ protected:
 		capacity = newCapacity;
 	}
 
-	T &
+	[[nodiscard]] T &
 	at(size_t pindex)
 	{
 		map();
-- 
cgit v1.2.3