Merge branch 'instancing'

5 files changed, 190 insertions, 8 deletions

diff --git a/test/Jamfile.jam b/test/Jamfile.jam
index b0eed5e..1ce73b7 100644
--- a/test/Jamfile.jam
+++ b/test/Jamfile.jam
@@ -53,10 +53,11 @@ run test-text.cpp ;
 run test-enumDetails.cpp ;
 run test-render.cpp : -- : test-assetFactory : <library>test ;
 run test-glContextBhvr.cpp ;
-run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt ] : <library>test ;
+run test-assetFactory.cpp : -- : [ sequence.insertion-sort [ glob-tree $(res) : *.* ] fixtures/rgb.txt test-instancing ] : <library>test ;
 run perf-assetFactory.cpp : -- : test-assetFactory : <library>benchmark <library>test ;
 run perf-persistence.cpp : -- : test-persistence : <library>benchmark <library>test ;
 run test-worker.cpp ;
+run test-instancing.cpp : : : <library>test ;
 compile test-static-enumDetails.cpp ;
 compile test-static-stream_support.cpp ;
 explicit perf-assetFactory ;
diff --git a/test/test-assetFactory.cpp b/test/test-assetFactory.cpp
index 3d79213..82a1825 100644
--- a/test/test-assetFactory.cpp
+++ b/test/test-assetFactory.cpp
@@ -29,7 +29,6 @@ public:
 	FactoryFixture() : sceneRenderer {size, output} { }
 	~FactoryFixture()
 	{
-		glDisable(GL_DEBUG_OUTPUT);
 		auto outpath = (TMP / boost::unit_test::framework::current_test_case().full_name()).replace_extension(".tga");
 		std::filesystem::create_directories(outpath.parent_path());
 		Texture::save(outImage, outpath.c_str());
@@ -108,8 +107,11 @@ BOOST_AUTO_TEST_CASE(foliage, *boost::unit_test::timeout(5))
 	auto tree_01_1_f = std::dynamic_pointer_cast<Foliage>(tree_01_1);
 	BOOST_REQUIRE(tree_01_1_f);
 
-	auto plant = std::make_shared<Plant>(tree_01_1_f, Location {{-2, 2, 0}, {}});
-	objects.objects.push_back(plant);
+	auto plant1 = std::make_shared<Plant>(tree_01_1_f, Location {{-2, 2, 0}, {0, 0, 0}});
+	auto plant2 = std::make_shared<Plant>(tree_01_1_f, Location {{3, -4, 0}, {0, 1, 0}});
+	auto plant3 = std::make_shared<Plant>(tree_01_1_f, Location {{-2, -4, 0}, {0, 2, 0}});
+	auto plant4 = std::make_shared<Plant>(tree_01_1_f, Location {{3, 2, 0}, {0, 3, 0}});
+	objects.objects.push_back(tree_01_1_f);
 
 	render(5);
 }
diff --git a/test/test-instancing.cpp b/test/test-instancing.cpp
new file mode 100644
index 0000000..c743ce0
--- /dev/null
+++ b/test/test-instancing.cpp
@@ -0,0 +1,181 @@
+#define BOOST_TEST_MODULE instancing
+
+#include "stream_support.hpp"
+#include "testHelpers.h"
+#include "testMainWindow.h"
+#include "ui/applicationBase.h"
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/unit_test.hpp>
+#include <set>
+
+#include <gfx/gl/instanceVertices.h>
+
+BOOST_GLOBAL_FIXTURE(ApplicationBase);
+BOOST_GLOBAL_FIXTURE(TestMainWindow);
+
+BOOST_FIXTURE_TEST_SUITE(i, InstanceVertices<int>)
+
+BOOST_AUTO_TEST_CASE(createDestroy)
+{
+	BOOST_CHECK(!data);
+	map();
+	BOOST_REQUIRE(data);
+	BOOST_CHECK_EQUAL(0, next);
+	BOOST_CHECK(unused.empty());
+	BOOST_CHECK(index.empty());
+	unmap();
+	BOOST_CHECK(!data);
+}
+
+BOOST_AUTO_TEST_CASE(acquireRelease)
+{
+	{
+		auto proxy = acquire();
+		*proxy = 20;
+		BOOST_CHECK_EQUAL(1, next);
+		BOOST_REQUIRE_EQUAL(1, index.size());
+		BOOST_CHECK_EQUAL(0, index.front());
+		BOOST_CHECK(unused.empty());
+	}
+	BOOST_CHECK_EQUAL(0, next);
+	BOOST_CHECK(unused.empty());
+	BOOST_CHECK(index.empty());
+}
+
+BOOST_AUTO_TEST_CASE(acquireReleaseMove)
+{
+	{
+		auto proxy1 = acquire();
+		*proxy1 = 20;
+		BOOST_CHECK_EQUAL(1, next);
+		auto proxy2 = std::move(proxy1);
+		proxy2 = 40;
+		BOOST_CHECK_EQUAL(1, next);
+		BOOST_CHECK_EQUAL(data[0], 40);
+	}
+	BOOST_CHECK_EQUAL(0, next);
+	BOOST_CHECK(unused.empty());
+	BOOST_CHECK(index.empty());
+}
+
+BOOST_AUTO_TEST_CASE(autoMapUnmap)
+{
+	{
+		auto proxy = acquire();
+		BOOST_CHECK(data);
+		std::ignore = bufferName();
+		BOOST_CHECK(data);
+		BOOST_CHECK_EQUAL(1, count());
+		BOOST_CHECK(!data);
+	}
+	BOOST_CHECK_EQUAL(0, count());
+}
+
+BOOST_AUTO_TEST_CASE(initialize)
+{
+	auto proxy = acquire(5);
+	const auto & constProxy = proxy;
+	BOOST_CHECK_EQUAL(*proxy, 5);
+	BOOST_CHECK_EQUAL(*constProxy, 5);
+	BOOST_CHECK_EQUAL(constProxy.get(), constProxy.get());
+}
+
+BOOST_AUTO_TEST_CASE(resize)
+{
+	constexpr auto COUNT = 500;
+	std::vector<decltype(acquire())> proxies;
+	std::vector<int> expected;
+	for (auto n = 0; n < COUNT; n++) {
+		proxies.push_back(acquire(n));
+		expected.emplace_back(n);
+	}
+	BOOST_CHECK_EQUAL_COLLECTIONS(expected.begin(), expected.end(), data, data + COUNT);
+	BOOST_CHECK_EQUAL_COLLECTIONS(expected.begin(), expected.end(), proxies.begin(), proxies.end());
+}
+
+BOOST_AUTO_TEST_CASE(shuffle)
+{
+	std::vector<decltype(acquire())> proxies;
+	BOOST_CHECK_EQUAL(0, proxies.emplace_back(acquire(0)));
+	BOOST_CHECK_EQUAL(1, proxies.emplace_back(acquire(1)));
+	BOOST_CHECK_EQUAL(2, proxies.emplace_back(acquire(2)));
+	BOOST_CHECK_EQUAL(3, proxies.emplace_back(acquire(3)));
+	BOOST_CHECK_EQUAL(4, next);
+	BOOST_CHECK_EQUAL(data + 0, proxies[0].get());
+	BOOST_CHECK_EQUAL(data + 1, proxies[1].get());
+	BOOST_CHECK_EQUAL(data + 2, proxies[2].get());
+	BOOST_CHECK_EQUAL(data + 3, proxies[3].get());
+	BOOST_CHECK(unused.empty());
+	BOOST_REQUIRE_EQUAL(4, index.size());
+	BOOST_CHECK_EQUAL(0, index[0]);
+	BOOST_CHECK_EQUAL(1, index[1]);
+	BOOST_CHECK_EQUAL(2, index[2]);
+	BOOST_CHECK_EQUAL(3, index[3]);
+	// Remove 1, 3 moves to [1]
+	proxies.erase(proxies.begin() + 1);
+	BOOST_REQUIRE_EQUAL(4, index.size());
+	BOOST_REQUIRE_EQUAL(1, unused.size());
+	BOOST_CHECK_EQUAL(1, unused[0]);
+	BOOST_CHECK_EQUAL(data + 0, proxies[0].get());
+	BOOST_CHECK_EQUAL(data + 2, proxies[1].get());
+	BOOST_CHECK_EQUAL(data + 1, proxies[2].get());
+	// Remove 1, 2 moves to [1]
+	proxies.erase(proxies.begin() + 1);
+	BOOST_REQUIRE_EQUAL(4, index.size());
+	BOOST_REQUIRE_EQUAL(2, unused.size());
+	BOOST_CHECK_EQUAL(1, unused[0]);
+	BOOST_CHECK_EQUAL(2, unused[1]);
+	BOOST_CHECK_EQUAL(data + 0, proxies[0].get());
+	BOOST_CHECK_EQUAL(data + 1, proxies[1].get());
+	// Add new, takes 2 at [2]
+	BOOST_CHECK_EQUAL(4, proxies.emplace_back(acquire(4)));
+	BOOST_REQUIRE_EQUAL(4, index.size());
+	BOOST_REQUIRE_EQUAL(1, unused.size());
+	BOOST_CHECK_EQUAL(1, unused[0]);
+	BOOST_CHECK_EQUAL(data + 0, proxies[0].get());
+	BOOST_CHECK_EQUAL(data + 1, proxies[1].get());
+	BOOST_CHECK_EQUAL(data + 2, proxies[2].get());
+}
+
+BOOST_DATA_TEST_CASE(shuffle_random, boost::unit_test::data::xrange(0, 10), x)
+{
+	std::ignore = x;
+	std::mt19937 gen(std::random_device {}());
+	std::map<int, InstanceVertices<int>::InstanceProxy> proxies;
+	const std::string_view actions = "aaaaaaaarararrraarrrararararaarrrarararararararararraarrrraaaarararaararar";
+	int n {};
+	for (const auto action : actions) {
+		switch (action) {
+			case 'a':
+				BOOST_REQUIRE_EQUAL(n, proxies.emplace(n, acquire(n)).first->second);
+				n++;
+				break;
+			case 'r':
+				BOOST_REQUIRE(!proxies.empty());
+				auto e = std::next(proxies.begin(),
+						std::uniform_int_distribution<> {0, static_cast<int>(proxies.size() - 1)}(gen));
+				proxies.erase(e);
+				break;
+		}
+
+		BOOST_REQUIRE_EQUAL(next, proxies.size());
+		for (const auto & [n, p] : proxies) {
+			BOOST_REQUIRE_EQUAL(n, p);
+		}
+		std::set<size_t> iused;
+		for (size_t i {}; i < index.size(); i++) {
+			if (std::find(unused.begin(), unused.end(), i) == unused.end()) {
+				iused.emplace(index[i]);
+			}
+		}
+		BOOST_TEST_CONTEXT(index) {
+			BOOST_REQUIRE_EQUAL(iused.size(), next);
+			if (!iused.empty()) {
+				BOOST_REQUIRE_EQUAL(*iused.begin(), 0);
+				BOOST_REQUIRE_EQUAL(*iused.rbegin(), next - 1);
+			}
+		}
+	}
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/test/test-render.cpp b/test/test-render.cpp
index 45acab5..1643068 100644
--- a/test/test-render.cpp
+++ b/test/test-render.cpp
@@ -86,7 +86,6 @@ BOOST_AUTO_TEST_CASE(basic)
 	ss.camera.setView({-10, -10, 60}, glm::normalize(glm::vec3 {1, 1, -0.5F}));
 	const TestScene scene;
 	ss.render(scene);
-	glDisable(GL_DEBUG_OUTPUT);
 	Texture::save(outImage, "/tmp/basic.tga");
 }
 
@@ -114,7 +113,6 @@ BOOST_AUTO_TEST_CASE(pointlight)
 	};
 	const PointLightScene scene;
 	ss.render(scene);
-	glDisable(GL_DEBUG_OUTPUT);
 	Texture::save(outImage, "/tmp/pointlight.tga");
 }
 
@@ -141,7 +139,6 @@ BOOST_AUTO_TEST_CASE(spotlight)
 	};
 	const PointLightScene scene;
 	ss.render(scene);
-	glDisable(GL_DEBUG_OUTPUT);
 	Texture::save(outImage, "/tmp/spotlight.tga");
 }
 
diff --git a/test/testMainWindow.cpp b/test/testMainWindow.cpp
index 49e18f1..57e3473 100644
--- a/test/testMainWindow.cpp
+++ b/test/testMainWindow.cpp
@@ -12,11 +12,12 @@ TestMainWindow::TestMainWindow() : Window {1, 1, __FILE__, SDL_WINDOW_OPENGL | S
 						(type == GL_DEBUG_TYPE_ERROR ? "** GL ERROR **" : ""), type, severity, message);
 				switch (type) {
 					case GL_DEBUG_TYPE_ERROR:
-					case GL_DEBUG_TYPE_PERFORMANCE:
 					case GL_DEBUG_TYPE_PORTABILITY:
 					case GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR:
 					case GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR:
 						BOOST_TEST_ERROR(msg.get());
+					case GL_DEBUG_TYPE_PERFORMANCE:
+						BOOST_TEST_WARN(msg.get());
 					default:
 						BOOST_TEST_MESSAGE(msg.get());
 				}