From 1647f6c9c209f4c2fd35b3f913e24d158c970f3d Mon Sep 17 00:00:00 2001
From: niki <nikeinikei98@gmail.com>
Date: Mon, 1 Aug 2022 19:30:08 +0200
Subject: [PATCH] vulkan: remove unnecessary quadindex code

---
 src/modules/graphics/vulkan/Buffer.h      |  3 ++-
 src/modules/graphics/vulkan/Graphics.cpp  | 15 +++------------
 src/modules/graphics/vulkan/Graphics.h    |  2 --
 src/modules/graphics/vulkan/Shader.h      |  1 +
 src/modules/graphics/vulkan/ShaderStage.h |  1 +
 src/modules/graphics/vulkan/Vulkan.cpp    |  2 ++
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/src/modules/graphics/vulkan/Buffer.h b/src/modules/graphics/vulkan/Buffer.h
index 9dca79de0..9e6d6f755 100644
--- a/src/modules/graphics/vulkan/Buffer.h
+++ b/src/modules/graphics/vulkan/Buffer.h
@@ -2,9 +2,10 @@
 #define LOVE_GRAPHICS_VULKAN_BUFFER_H
 
 #include "graphics/Buffer.h"
+#include "graphics/Volatile.h"
+
 #include <vulkan/vulkan.h>
 #include "vk_mem_alloc.h"
-#include "graphics/Volatile.h"
 
 
 namespace love {
diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp
index bf1c8decb..da07ee2c5 100644
--- a/src/modules/graphics/vulkan/Graphics.cpp
+++ b/src/modules/graphics/vulkan/Graphics.cpp
@@ -1266,7 +1266,6 @@ VkSampler Graphics::createSampler(const SamplerState& samplerState) {
 	VkPhysicalDeviceProperties properties{};
 	vkGetPhysicalDeviceProperties(physicalDevice, &properties);
 
-	// fixme: determine actual values
 	VkSamplerCreateInfo samplerInfo{};
 	samplerInfo.sType = VK_STRUCTURE_TYPE_SAMPLER_CREATE_INFO;
 	samplerInfo.magFilter = Vulkan::getFilter(samplerState.magFilter);
@@ -1511,18 +1510,10 @@ void Graphics::createDefaultTexture() {
 	standardTexture.reset((Texture*)newTexture(settings));
 }
 
-void Graphics::createQuadIndexBuffer() {
-	if (quadIndexBuffer != nullptr)
-		return;
-
-	size_t size = sizeof(uint16) * getIndexCount(TRIANGLEINDEX_QUADS, LOVE_UINT16_MAX);
-	quadIndexBuffer.reset((StreamBuffer*)newStreamBuffer(BUFFERUSAGE_INDEX, size));
-	auto map = quadIndexBuffer->map(size);
-	fillIndices(TRIANGLEINDEX_QUADS, 0, LOVE_UINT16_MAX, (uint16*)map.data);
-	quadIndexBuffer->unmap(size);
-}
-
 void Graphics::cleanup() {
+	delete quadIndexBuffer;
+	quadIndexBuffer = nullptr;
+
 	cleanupSwapChain();
 
 	for (auto &cleanUpFns : cleanUpFunctions) {
diff --git a/src/modules/graphics/vulkan/Graphics.h b/src/modules/graphics/vulkan/Graphics.h
index 94ca597db..364565eb1 100644
--- a/src/modules/graphics/vulkan/Graphics.h
+++ b/src/modules/graphics/vulkan/Graphics.h
@@ -182,7 +182,6 @@ private:
 	void createCommandBuffers();
 	void createSyncObjects();
 	void createDefaultTexture();
-	void createQuadIndexBuffer();
 	void cleanup();
 	void cleanupSwapChain();
 	void recreateSwapChain();
@@ -230,7 +229,6 @@ private:
 	bool framebufferResized = false;
 	VmaAllocator vmaAllocator = VK_NULL_HANDLE;
 	std::unique_ptr<Texture> standardTexture = nullptr;
-	std::unique_ptr<StreamBuffer> quadIndexBuffer = nullptr;
 	// we need an array of draw buffers, since the frames are being rendered asynchronously
 	// and we can't (or shouldn't) update the contents of the buffers while they're still in flight / being rendered.
 	std::vector<BatchedDrawBuffers> batchedDrawBuffers;
diff --git a/src/modules/graphics/vulkan/Shader.h b/src/modules/graphics/vulkan/Shader.h
index 26d300d15..13976a114 100644
--- a/src/modules/graphics/vulkan/Shader.h
+++ b/src/modules/graphics/vulkan/Shader.h
@@ -4,6 +4,7 @@
 #include <graphics/Shader.h>
 #include <graphics/vulkan/ShaderStage.h>
 #include "Vulkan.h"
+
 #include <vulkan/vulkan.h>
 
 #include <map>
diff --git a/src/modules/graphics/vulkan/ShaderStage.h b/src/modules/graphics/vulkan/ShaderStage.h
index a67f8efe2..edb3cd798 100644
--- a/src/modules/graphics/vulkan/ShaderStage.h
+++ b/src/modules/graphics/vulkan/ShaderStage.h
@@ -3,6 +3,7 @@
 
 #include "graphics/ShaderStage.h"
 #include "modules/graphics/Graphics.h"
+
 #include <vulkan/vulkan.h>
 
 namespace love {
diff --git a/src/modules/graphics/vulkan/Vulkan.cpp b/src/modules/graphics/vulkan/Vulkan.cpp
index 6cb18c998..6c0f9f500 100644
--- a/src/modules/graphics/vulkan/Vulkan.cpp
+++ b/src/modules/graphics/vulkan/Vulkan.cpp
@@ -301,6 +301,8 @@ TextureFormat Vulkan::getTextureFormat(PixelFormat format) {
 		case PIXELFORMAT_ASTC_12x10:
 		case PIXELFORMAT_ASTC_12x12:
 			throw love::Exception("unimplemented pixel format");
+		default:
+			throw love::Exception("unknown pixel format");
 	}
 
 	return textureFormat;