Added basic support for sRGB framebuffer usage

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.7)
 
 project(vsgImGui
-    VERSION 0.6.0
+    VERSION 0.7.0
     DESCRIPTION "VulkanSceneGraph, ImGui and ImPlot integration library"
     LANGUAGES CXX
 )
@@ -22,7 +22,7 @@ if (VULKAN_SDK)
     set(ENV{VULKAN_SDK} ${VULKAN_SDK})
 endif()
 
-find_package(vsg 1.0.5)
+find_package(vsg 1.1.10)
 
 vsg_setup_dir_vars()
 vsg_setup_build_vars()

include/vsgImGui/Export.h

@@ -40,3 +40,24 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <vulkan/vulkan.h>
 #define ImTextureID VkDescriptorSet
+
+#include <vsg/maths/vec2.h>
+#include <vsg/maths/vec4.h>
+
+#define IM_VEC2_CLASS_EXTRA                               \
+    constexpr ImVec2(const vsg::vec2& v) : x(v.x), y(v.y) \
+    {                                                     \
+    }                                                     \
+    operator vsg::vec2() const                            \
+    {                                                     \
+        return vsg::vec2(x, y);                           \
+    }
+
+#define IM_VEC4_CLASS_EXTRA                                               \
+    constexpr ImVec4(const vsg::vec4& v) : x(v.x), y(v.y), z(v.z), w(v.w) \
+    {                                                                     \
+    }                                                                     \
+    operator vsg::vec4() const                                            \
+    {                                                                     \
+        return vsg::vec4(x, y, z, w);                                     \
+    }

include/vsgImGui/RenderImGui.h

@@ -89,6 +89,9 @@ namespace vsgImGui
         void _uploadFonts();
     };
 
+    // temporary workaround for Dear ImGui's nonexistent sRGB awareness
+    extern VSGIMGUI_DECLSPEC void ImGuiStyle_sRGB_to_linear(ImGuiStyle& style);
+
 } // namespace vsgImGui
 
 EVSG_type_name(vsgImGui::RenderImGui);

src/vsgImGui/RenderImGui.cpp

@@ -27,6 +27,8 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include "../imgui/backends/imgui_impl_vulkan.h"
 
 #include <vsg/io/Logger.h>
+#include <vsg/maths/color.h>
+#include <vsg/utils/CoordinateSpace.h>
 #include <vsg/vk/State.h>
 #include <vsg/vk/SubmitCommands.h>
 
@@ -55,6 +57,15 @@ namespace vsgImGui
         }
     };
 
+    void ImGuiStyle_sRGB_to_linear(ImGuiStyle& style)
+    {
+        for (size_t i = 0; i < ImGuiCol_COUNT; ++i)
+        {
+            ImVec4& color = style.Colors[i];
+            color = vsg::sRGB_to_linear<float>(color);
+        }
+    }
+
 } // namespace vsgImGui
 
 RenderImGui::RenderImGui(const vsg::ref_ptr<vsg::Window>& window, bool useClearAttachments)
@@ -118,7 +129,29 @@ void RenderImGui::_init(
     VkExtent2D imageSize, bool useClearAttachments)
 {
     IMGUI_CHECKVERSION();
-    if (!ImGui::GetCurrentContext()) ImGui::CreateContext();
+
+    if (!ImGui::GetCurrentContext())
+    {
+        ImGui::CreateContext();
+    }
+
+    bool sRGB = false;
+    for (auto& attachment : renderPass->attachments)
+    {
+        if (attachment.finalLayout==VK_IMAGE_LAYOUT_PRESENT_SRC_KHR || attachment.finalLayout==VK_IMAGE_LAYOUT_COLOR_ATTACHMENT_OPTIMAL)
+        {
+            if (attachment.format == VK_FORMAT_B8G8R8_SRGB ||
+                attachment.format == VK_FORMAT_B8G8R8A8_SRGB ||
+                attachment.format == VK_FORMAT_R8G8B8_SRGB ||
+                attachment.format == VK_FORMAT_R8G8B8A8_SRGB) sRGB = true;
+        }
+    }
+
+    if (sRGB)
+    {
+        ImGuiStyle_sRGB_to_linear(ImGui::GetStyle());
+    }
+
     if (!ImPlot::GetCurrentContext()) ImPlot::CreateContext();
 
     VkSampleCountFlagBits samples = VK_SAMPLE_COUNT_1_BIT;