Instance: use utf8 string for application name

JonathSpirit · Sep 16, 2024 · 9e8a8ac · 9e8a8ac
1 parent 825b720
commit 9e8a8ac
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 11 deletions.
diff --git a/includes/FastEngine/vulkan/C_instance.hpp b/includes/FastEngine/vulkan/C_instance.hpp
@@ -20,7 +20,7 @@
 #include "FastEngine/fge_extern.hpp"
 #include "volk.h"
 #include "C_physicalDevice.hpp"
-#include "SDL_vulkan.h"
+#include "tinyutf8.h"
 #include <optional>
 #include <string>
 #include <vector>
@@ -39,7 +39,7 @@ class FGE_API Instance
 {
 public:
     Instance();
-    explicit Instance(std::string applicationName,
+    explicit Instance(std::string_view applicationName,
                       uint16_t versionMajor = 1,
                       uint16_t versionMinor = 0,
                       uint16_t versionPatch = 0);
@@ -58,13 +58,13 @@ class FGE_API Instance
      * \param versionMinor The application version minor
      * \param versionPatch The application version patch
      */
-    void create(std::string applicationName,
+    void create(std::string_view applicationName,
                 uint16_t versionMajor = 1,
                 uint16_t versionMinor = 0,
                 uint16_t versionPatch = 0);
     void destroy();
 
-    [[nodiscard]] std::string const& getApplicationName() const;
+    [[nodiscard]] tiny_utf8::string const& getApplicationName() const;
 
     [[nodiscard]] VkInstance get() const;
 
@@ -91,7 +91,7 @@ class FGE_API Instance
     void enumeratePhysicalDevices();
 
     VkInstance g_instance;
-    std::string g_applicationName;
+    tiny_utf8::string g_applicationName;
 
     std::vector<PhysicalDevice> g_physicalDevices;
 };

diff --git a/sources/vulkan/C_instance.cpp b/sources/vulkan/C_instance.cpp
@@ -28,10 +28,13 @@ namespace fge::vulkan
 Instance::Instance() :
         g_instance(VK_NULL_HANDLE)
 {}
-Instance::Instance(std::string applicationName, uint16_t versionMajor, uint16_t versionMinor, uint16_t versionPatch) :
+Instance::Instance(std::string_view applicationName,
+                   uint16_t versionMajor,
+                   uint16_t versionMinor,
+                   uint16_t versionPatch) :
         g_instance(VK_NULL_HANDLE)
 {
-    this->create(std::move(applicationName), versionMajor, versionMinor, versionPatch);
+    this->create(applicationName, versionMajor, versionMinor, versionPatch);
 }
 Instance::Instance(Instance&& r) noexcept :
         g_instance(r.g_instance),
@@ -45,14 +48,17 @@ Instance::~Instance()
     this->destroy();
 }
 
-void Instance::create(std::string applicationName, uint16_t versionMajor, uint16_t versionMinor, uint16_t versionPatch)
+void Instance::create(std::string_view applicationName,
+                      uint16_t versionMajor,
+                      uint16_t versionMinor,
+                      uint16_t versionPatch)
 {
     if (this->g_instance != VK_NULL_HANDLE)
     {
         throw fge::Exception{"instance already created !"};
     }
 
-    this->g_applicationName = std::move(applicationName);
+    this->g_applicationName = applicationName;
 
     VkApplicationInfo appInfo{};
     appInfo.sType = VK_STRUCTURE_TYPE_APPLICATION_INFO;
@@ -117,7 +123,7 @@ void Instance::destroy()
     }
 }
 
-std::string const& Instance::getApplicationName() const
+tiny_utf8::string const& Instance::getApplicationName() const
 {
     return this->g_applicationName;
 }

diff --git a/sources/vulkan/C_surface.cpp b/sources/vulkan/C_surface.cpp
@@ -76,7 +76,7 @@ SurfaceSDLWindow::SurfaceSDLWindow(Instance& instance,
                                    uint32_t flags) :
         SurfaceSDLWindow(instance)
 {
-    this->create(instance.getApplicationName(), position, size, flags);
+    this->create(instance.getApplicationName().cpp_str_view(), position, size, flags);
 }
 SurfaceSDLWindow::SurfaceSDLWindow(SurfaceSDLWindow&& r) noexcept :
         SurfaceWindow(std::move(r)),