Added ability to configure texture filter on construction

Raelr · Raelr · commit 6d208fc5c2a7 · 2023-11-14T11:24:40.000+11:00
diff --git a/Makefile b/Makefile
@@ -54,9 +54,9 @@ export compileFlags := -Wall -std=c++17
 export linkFlags += -L $(libDir)
 buildFlagsFile:=.buildflags
 
-.PHONY: all testapp gameapp renderapp tilemapapp package-gameapp package-renderapp package-tilemap buildFlags clean format
+.PHONY: all testapp gameapp renderapp tilemapapp package-gameapp package-renderapp package-tilemapapp buildFlags clean format
 
-all: testapp package-gameapp package-renderapp package-tilemap
+all: testapp package-gameapp package-renderapp package-tilemapapp
 
 $(utilsLib): buildFlags
 	"$(MAKE)" -C $(engineDir)/utils CXXFLAGS="$(CXXFLAGS)"
@@ -96,7 +96,7 @@ package-gameapp: gameapp
 package-renderapp: renderapp
 	"$(MAKE)" package -C $(examplesDir)/render CXXFLAGS="$(CXXFLAGS)"
 
-package-tilemap: tilemapapp
+package-tilemapapp: tilemapapp
 	"$(MAKE)" package -C $(examplesDir)/tilemap CXXFLAGS="$(CXXFLAGS)"
 
 # Check to invalidate the build if flags have changed
diff --git a/engine/render/renderer/Renderer.cpp b/engine/render/renderer/Renderer.cpp
@@ -48,7 +48,6 @@ Renderer::Renderer(Window& window) : window {window}
 Renderer::~Renderer()
 {
     CC_LOG_INFO("Destroying renderer")
-    Vulkan::Context::GetCurrentDevice()->WaitIdle();
     DescriptorPool::DestroyPool();
     Renderer3D::DestroyRenderer3D();
     Statics::Free();
@@ -62,7 +61,7 @@ void Renderer::DrawFrame()
 
 void Renderer::RecreateSwapChain()
 {
-    ClearDeviceQueue();
+    ClearQueues();
     auto extent = window.GetExtents();
 
     while (!window.IsVisible() || extent.width == 0.0 || extent.height == 0.0)
@@ -176,7 +175,7 @@ void Renderer::EndFrame()
     renderer2D.Flush();
 }
 
-void Renderer::ClearDeviceQueue()
+void Renderer::ClearQueues()
 {
     Vulkan::Context::GetCurrentDevice()->WaitIdle();
 }
diff --git a/engine/render/renderer/Renderer.h b/engine/render/renderer/Renderer.h
@@ -45,7 +45,7 @@ class Renderer
     bool StartFrame();
     void EndFrame();
 
-    void ClearDeviceQueue();
+    void ClearQueues();
 
     void DrawQuad(const Vec2 position,
                   const Vec2 scale = {1.f, 1.f},
diff --git a/engine/render/renderer/platform/vulkan/Font.cpp b/engine/render/renderer/platform/vulkan/Font.cpp
@@ -42,6 +42,7 @@ Font::Font(const char* filePath)
                         sizeof(uint8_t) * extent.width * extent.height,
                         extent.width,
                         extent.height,
+                        Utils::TEXTURE_FILTER_LINEAR,
                         Texture2D::Usage::TEX_USAGE_FONT);
 
     PopulateTextureAtlas(buffer);
diff --git a/engine/render/renderer/platform/vulkan/Texture2D.cpp b/engine/render/renderer/platform/vulkan/Texture2D.cpp
@@ -13,6 +13,7 @@
 #include "Context.h"
 #include "render/renderer/buffer/Buffer.h"
 #include "utils/Descriptor.h"
+#include "utils/TypeAdaptor.h"
 
 #define STB_IMAGE_IMPLEMENTATION
 #include <stb_image.h>
@@ -21,11 +22,12 @@
 
 namespace Siege::Vulkan
 {
-Texture2D::Texture2D(const char* name, Usage texUsage)
+Texture2D::Texture2D(const char* name, Utils::TextureFilter filter, Usage texUsage)
 {
     LoadTexture(Constants::DEFAULT_TEXTURE_2D, Constants::DEFAULT_TEXTURE_SIZE, 16, 16, texUsage);
 
-    VkSamplerCreateInfo samplerInfo = Utils::Descriptor::SamplerCreateInfo(VK_FILTER_LINEAR);
+    VkSamplerCreateInfo samplerInfo =
+        Utils::Descriptor::SamplerCreateInfo(Utils::ToVkFilter(filter));
 
     info = {image.GetInfo()};
 
@@ -37,11 +39,12 @@ Texture2D::Texture2D(const char* name, Usage texUsage)
     info.usage = texUsage;
 }
 
-Texture2D::Texture2D(const char* name, const char* filePath)
+Texture2D::Texture2D(const char* name, const char* filePath, Utils::TextureFilter filter)
 {
     LoadFromFile(filePath);
 
-    VkSamplerCreateInfo samplerInfo = Utils::Descriptor::SamplerCreateInfo(VK_FILTER_LINEAR);
+    VkSamplerCreateInfo samplerInfo =
+        Utils::Descriptor::SamplerCreateInfo(Utils::ToVkFilter(filter));
 
     info = {image.GetInfo()};
 
@@ -55,11 +58,13 @@ Texture2D::Texture2D(const char* name,
                      size_t size,
                      uint32_t width,
                      uint32_t height,
+                     Utils::TextureFilter filter,
                      Usage texUsage)
 {
     LoadTexture(pixels, size, width, height, texUsage);
 
-    VkSamplerCreateInfo samplerInfo = Utils::Descriptor::SamplerCreateInfo(VK_FILTER_LINEAR);
+    VkSamplerCreateInfo samplerInfo =
+        Utils::Descriptor::SamplerCreateInfo(Utils::ToVkFilter(filter));
 
     info = {image.GetInfo()};
 
@@ -91,6 +96,10 @@ void Texture2D::LoadFromFile(const char* filePath)
     int texWidth, texHeight, texChannels;
 
     stbi_uc* pixels = stbi_load(filePath, &texWidth, &texHeight, &texChannels, STBI_rgb_alpha);
+    defer([pixels] {
+        stbi_image_free(pixels);
+        ;
+    });
 
     CC_ASSERT(pixels, "Failed to load image file!")
 
@@ -104,6 +113,8 @@ void Texture2D::LoadFromFile(const char* filePath)
     memcpy(pixelPtr, pixels, sizeof(uint8_t) * imageSize);
 
     Buffer::Buffer stagingBuffer;
+    defer([&stagingBuffer] { Buffer::DestroyBuffer(stagingBuffer); });
+
     Buffer::CreateBuffer(imageSize,
                          VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
                          // specifies that data is accessible on the CPU.
@@ -115,8 +126,6 @@ void Texture2D::LoadFromFile(const char* filePath)
 
     Buffer::CopyData(stagingBuffer, imageSize, pixelPtr);
 
-    stbi_image_free(pixels);
-
     extent = {static_cast<uint32_t>(texWidth), static_cast<uint32_t>(texHeight)};
 
     Utils::Extent3D imageExtent {static_cast<uint32_t>(texWidth),
@@ -125,8 +134,6 @@ void Texture2D::LoadFromFile(const char* filePath)
     image = Image({Utils::RGBASRGB, imageExtent, Vulkan::Utils::USAGE_TEXTURE, 1, 1});
 
     image.CopyBuffer(stagingBuffer.buffer, imageExtent);
-
-    Buffer::DestroyBuffer(stagingBuffer);
 }
 
 void Texture2D::LoadTexture(const uint8_t* pixels,
diff --git a/engine/render/renderer/platform/vulkan/Texture2D.h b/engine/render/renderer/platform/vulkan/Texture2D.h
@@ -57,21 +57,26 @@ class Texture2D
      * default white texture
      * @param name the name of the texture being created
      */
-    Texture2D(const char* name, Usage texUsage = TEX_USAGE_TEX2D);
+    Texture2D(const char* name,
+              Utils::TextureFilter filter = Utils::TEXTURE_FILTER_LINEAR,
+              Usage texUsage = TEX_USAGE_TEX2D);
 
     /**
      * The texture constructor used for loading a texture from file. This loads data from a given
      * file path and stores pixel data in the class
      * @param name the name of the texture
      * @param filePath the path of the PNG or JPG file
      */
-    Texture2D(const char* name, const char* filePath);
+    Texture2D(const char* name,
+              const char* filePath,
+              Utils::TextureFilter filter = Utils::TEXTURE_FILTER_LINEAR);
 
     Texture2D(const char* name,
               const uint8_t* pixels,
               size_t size,
               uint32_t width,
               uint32_t height,
+              Utils::TextureFilter filter = Utils::TEXTURE_FILTER_LINEAR,
               Usage texUsage = Usage::TEX_USAGE_TEX2D);
 
     /**
diff --git a/engine/render/renderer/platform/vulkan/utils/TypeAdaptor.h b/engine/render/renderer/platform/vulkan/utils/TypeAdaptor.h
@@ -355,6 +355,21 @@ DECL_VULKAN_SWITCH_FUN(VertexInputRate,
                                   VK_VERTEX_INPUT_RATE_INSTANCE,
                                   INPUT_RATE_INSTANCE) SWITCH_DEFAULT(INPUT_RATE_VERTEX))
 
+DECL_VULKAN_SWITCH_FUN(VkFilter,
+                       TextureFilter,
+                       SWITCH_MEM(TextureFilter, TEXTURE_FILTER_NEAREST, VK_FILTER_NEAREST)
+                           SWITCH_MEM(TextureFilter, TEXTURE_FILTER_LINEAR, VK_FILTER_LINEAR)
+                               SWITCH_MEM(TextureFilter,
+                                          TEXTURE_FILTER_MAX_ENUM,
+                                          VK_FILTER_MAX_ENUM) SWITCH_DEFAULT(VK_FILTER_CUBIC_EXT))
+
+DECL_VULKAN_SWITCH_FUN(TextureFilter,
+                       VkFilter,
+                       SWITCH_MEM(VkFilter, VK_FILTER_NEAREST, TEXTURE_FILTER_NEAREST)
+                           SWITCH_MEM(VkFilter, VK_FILTER_LINEAR, TEXTURE_FILTER_LINEAR)
+                               SWITCH_MEM(VkFilter, VK_FILTER_MAX_ENUM, TEXTURE_FILTER_MAX_ENUM)
+                                   SWITCH_DEFAULT(TEXTURE_FILTER_CUBIC_EXT))
+
 //----------------------------------------- Structs -----------------------------------------------
 
 DECL_CONVERSION_FUN(VkExtent2D, Extent2D, {GET_MEMBER(width), GET_MEMBER(height)})
diff --git a/engine/render/renderer/platform/vulkan/utils/Types.h b/engine/render/renderer/platform/vulkan/utils/Types.h
@@ -226,6 +226,15 @@ enum MemoryProperty
     MEMORY_HOST_VISIBLE = 0x00000004
 };
 
+enum TextureFilter
+{
+    TEXTURE_FILTER_NEAREST = 0,
+    TEXTURE_FILTER_LINEAR = 1,
+    TEXTURE_FILTER_CUBIC_EXT = 1000015000,
+    TEXTURE_FILTER_CUBIC_IMG = TEXTURE_FILTER_CUBIC_EXT,
+    TEXTURE_FILTER_MAX_ENUM = 0x7FFFFFFF
+};
+
 //----------------------------------------- Structs -----------------------------------------------
 
 struct Extent2D
diff --git a/engine/utils/Macros.h b/engine/utils/Macros.h
@@ -25,8 +25,4 @@
 #define STRINGIFY(x) #x
 #define TOSTRING(x) STRINGIFY(x)
 
-// Macro for declaring a binary operator
-#define DECL_BINARY_OP_NO_IMPL(op, returnType, lhsType, rhsType) \
-    returnType operator op(lhsType lhs, rhsType rhs) _SEMICOLON
-
 #endif // SIEGE_ENGINE_MACROS_H
diff --git a/engine/utils/collections/ArrayUtils.h b/engine/utils/collections/ArrayUtils.h
@@ -17,8 +17,8 @@
 #include <cstdint>
 #include <cstring>
 #include <initializer_list>
-#include <utility>
 #include <iterator>
+#include <utility>
 
 namespace Siege
 {
diff --git a/examples/game/src/main.cpp b/examples/game/src/main.cpp
@@ -132,7 +132,7 @@ int main(int argc, char* argv[])
         Siege::Statics::Scene().LoadNextScene();
     }
 
-    renderer.ClearDeviceQueue();
+    renderer.ClearQueues();
 
     return 0;
 }
diff --git a/examples/render/src/main.cpp b/examples/render/src/main.cpp
@@ -368,5 +368,7 @@ int main()
         renderer.EndFrame();
     }
 
+    renderer.ClearQueues();
+
     return 0;
 }
diff --git a/examples/tilemap/assets/textures/tilemap.png b/examples/tilemap/assets/textures/tilemap.png
diff --git a/examples/tilemap/assets/tilemap.png b/examples/tilemap/assets/tilemap.png
diff --git a/examples/tilemap/src/main.cpp b/examples/tilemap/src/main.cpp
@@ -7,12 +7,12 @@
 //     https://opensource.org/licenses/Zlib
 //
 
-#include <window/Window.h>
 #include <render/renderer/Renderer.h>
 #include <render/renderer/camera/Camera.h>
-#include <utils/math/vec/Vec3.h>
 #include <utils/math/Projection.h>
 #include <utils/math/Transform.h>
+#include <utils/math/vec/Vec3.h>
+#include <window/Window.h>
 
 static const constexpr int WIDTH = 800;
 static const constexpr int HEIGHT = 600;
@@ -24,11 +24,14 @@ int main()
     Siege::Renderer renderer(window);
 
     auto pixel = Siege::Vulkan::Font("assets/fonts/PublicPixel.ttf");
-    auto tilemap = Siege::Vulkan::Texture2D("tilemap", "assets/textures/tilemap.png");
+    auto tilemap = Siege::Vulkan::Texture2D("tilemap",
+                                            "assets/textures/tilemap.png",
+                                            Siege::Vulkan::Utils::TEXTURE_FILTER_NEAREST);
 
     Siege::Camera camera;
 
-    camera.projection = Siege::Orthographic(0.f, window.GetWidth(), window.GetHeight(), 0.f, 0.1f, 1000.f);
+    camera.projection =
+        Siege::Orthographic(0.f, window.GetWidth(), window.GetHeight(), 0.f, 0.1f, 1000.f);
     camera.view = Siege::LookAt(Siege::Vec3::Zero(), {0.f, 0.f, 1.f});
 
     renderer.SetCamera2D(camera);
@@ -37,16 +40,23 @@ int main()
     {
         window.Update();
 
-        if(!renderer.StartFrame()) continue;
+        if (!renderer.StartFrame()) continue;
 
         renderer.DrawGrid2D(100.f, {.2f, .2f, .2f}, window.GetDPI());
 
-        renderer.DrawText2D("Hello World!", pixel, {10.f, 10.f}, {64.f, 64.f}, 0.f, Siege::IColour::Black);
+        renderer.DrawText2D("Hello World!",
+                            pixel,
+                            {10.f, 10.f},
+                            {64.f, 64.f},
+                            0.f,
+                            Siege::IColour::Black);
 
-        renderer.DrawQuad({400.f, 300.f}, {256.f, 256.f}, Siege::IColour::White, 0.f, 0, &tilemap);
+        renderer.DrawQuad({400.f, 300.f}, {64.f, 64.f}, Siege::IColour::White, 0.f, 0, &tilemap);
 
         renderer.EndFrame();
     }
 
+    renderer.ClearQueues();
+
     return 0;
 }

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,6 @@ Renderer::Renderer(Window& window) : window {window}`
`48`	`48`	`Renderer::~Renderer()`
`49`	`49`	`{`
`50`	`50`	`CC_LOG_INFO("Destroying renderer")`
`51`		`- Vulkan::Context::GetCurrentDevice()->WaitIdle();`
`52`	`51`	`DescriptorPool::DestroyPool();`
`53`	`52`	`Renderer3D::DestroyRenderer3D();`
`54`	`53`	`Statics::Free();`
`@@ -62,7 +61,7 @@ void Renderer::DrawFrame()`
`62`	`61`
`63`	`62`	`void Renderer::RecreateSwapChain()`
`64`	`63`	`{`
`65`		`- ClearDeviceQueue();`
	`64`	`+ ClearQueues();`
`66`	`65`	`auto extent = window.GetExtents();`
`67`	`66`
`68`	`67`	`while (!window.IsVisible() \|\| extent.width == 0.0 \|\| extent.height == 0.0)`
`@@ -176,7 +175,7 @@ void Renderer::EndFrame()`
`176`	`175`	`renderer2D.Flush();`
`177`	`176`	`}`
`178`	`177`
`179`		`-void Renderer::ClearDeviceQueue()`
	`178`	`+void Renderer::ClearQueues()`
`180`	`179`	`{`
`181`	`180`	`Vulkan::Context::GetCurrentDevice()->WaitIdle();`
`182`	`181`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@`
`17`	`17`	`#include <cstdint>`
`18`	`18`	`#include <cstring>`
`19`	`19`	`#include <initializer_list>`
`20`		`-#include <utility>`
`21`	`20`	`#include <iterator>`
	`21`	`+#include <utility>`
`22`	`22`
`23`	`23`	`namespace Siege`
`24`	`24`	`{`