From c89a633f59d0e393695c10f28c4ba8635eadffba Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Sat, 7 Mar 2026 11:42:46 +0000
Subject: Replace glContainer with glAllocator

glContainer is no longer required, as we can use std::vector with a
custom allocator which uses OpenGL buffers for storage. Minor irritation
is that the mapped buffers aren't guaranteed to be flushed in the tests,
so sometimes we're missing bits in a test render.
---
 gfx/gl/instanceVertices.h | 39 +++++++++++++++++++++++++++------------
 1 file changed, 27 insertions(+), 12 deletions(-)

(limited to 'gfx')

diff --git a/gfx/gl/instanceVertices.h b/gfx/gl/instanceVertices.h
index ecadf8f..f24eaa3 100644
--- a/gfx/gl/instanceVertices.h
+++ b/gfx/gl/instanceVertices.h
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "glContainer.h"
+#include "glAllocator.h"
 #include <cassert>
 #include <functional>
 #include <special_members.h>
 #include <utility>
 
-template<typename T> class InstanceVertices : protected glContainer<T> {
-	using base = glContainer<T>;
+template<typename T> class InstanceVertices : protected glVector<T> {
+	using base = glVector<T>;
 
 public:
 	class [[nodiscard]] InstanceProxy {
@@ -120,16 +120,31 @@ public:
 		return InstanceProxy {this, index.size() - 1};
 	}
 
-	using base::bufferName;
-	using base::reserve;
-
-	[[nodiscard]] auto
-	size() const
+	[[nodiscard]] GLuint
+	bufferName() const
 	{
-		base::unmap();
-		return base::size();
+		return base::get_allocator().getNameFor(static_cast<const base &>(*this));
 	}
 
+	using base::at;
+	using base::begin;
+	using base::cbegin;
+	using base::cend;
+	using base::crbegin;
+	using base::crend;
+	using base::end;
+	using base::rbegin;
+	using base::rend;
+	using base::size;
+	using base::operator[];
+	using base::back;
+	using base::capacity;
+	using base::data;
+	using base::empty;
+	using base::front;
+	using base::reserve;
+	using base::shrink_to_fit;
+
 	template<typename Pred>
 	base::size_type
 	partition(Pred pred)
@@ -195,8 +210,8 @@ protected:
 	}
 
 	template<typename Pred>
-	glContainer<T>::iterator
-	partition(glContainer<T>::iterator first, glContainer<T>::iterator last, Pred pred)
+	base::iterator
+	partition(base::iterator first, base::iterator last, Pred pred)
 	{
 		while (first < last) {
 			first = std::find_if_not(first, last, pred);
-- 
cgit v1.3