WIP gfx backend working

Author: hoffstadt-nasa

extensions/pl_dear_imgui_ext.cpp

@@ -19,13 +19,11 @@ Index of this file:
 #ifndef PL_DEAR_IMGUI_EXT_H
 #define PL_DEAR_IMGUI_EXT_H
 
-#define ImTextureID void*
-
 //-----------------------------------------------------------------------------
 // [SECTION] APIs
 //-----------------------------------------------------------------------------
 
-#define plDearImGuiI_version {0, 2, 0}
+#define plDearImGuiI_version {0, 3, 0}
 
 //-----------------------------------------------------------------------------
 // [SECTION] includes
@@ -38,12 +36,15 @@ Index of this file:
 // [SECTION] forward declarations
 //-----------------------------------------------------------------------------
 
+// basic types
+typedef struct _plImGuiPipelineInitInfo plImGuiPipelineInitInfo;
+typedef struct _plImGuiGraphicsInitInfo plImGuiGraphicsInitInfo;
+
 // external (pl_graphics_ext.h)
-typedef union  plBindGroupHandle  plBindGroupHandle;
-typedef struct _plSwapchain       plSwapchain;
-typedef struct _plCommandBuffer   plCommandBuffer;
-typedef struct _plDevice          plDevice;
+typedef struct _plCommandBuffer        plCommandBuffer;
+typedef struct _plDevice               plDevice;
 typedef struct _plRenderAttachmentInfo plRenderAttachmentInfo;
+typedef int plSampleCount;
 
 //-----------------------------------------------------------------------------
 // [SECTION] public api
@@ -54,31 +55,43 @@ PL_API void pl_load_dear_imgui_ext  (const plApiRegistryI*, bool reload);
 PL_API void pl_unload_dear_imgui_ext(const plApiRegistryI*, bool reload);
 
 // setup/shutdown
-PL_API void pl_dear_imgui_initialize(plDevice*, plSwapchain*, const plRenderAttachmentInfo*);
+PL_API void pl_dear_imgui_initialize(plImGuiGraphicsInitInfo*);
 PL_API void pl_dear_imgui_cleanup   (void);
 
 // per frame
 PL_API void pl_dear_imgui_new_frame(plDevice*);
 PL_API void pl_dear_imgui_render   (plCommandBuffer*);
 
-// for using texture in Dear ImGui specifically
-PL_API ImTextureID pl_dear_imgui_get_texture_id_from_bindgroup(plDevice*, plBindGroupHandle);
-
 //-----------------------------------------------------------------------------
 // [SECTION] public api struct
 //-----------------------------------------------------------------------------
 
 typedef struct _plDearImGuiI
 {
     // setup/shutdown
-    void (*initialize)(plDevice*, plSwapchain*, const plRenderAttachmentInfo*);
+    void (*initialize)(plImGuiGraphicsInitInfo*);
     void (*cleanup)   (void);
 
     // per frame
     void (*new_frame)(plDevice*);
     void (*render)   (plCommandBuffer*);
-
-    ImTextureID (*get_texture_id_from_bindgroup)(plDevice*, plBindGroupHandle);
 } plDearImGuiI;
 
+//-----------------------------------------------------------------------------
+// [SECTION] structs
+//-----------------------------------------------------------------------------
+
+typedef struct _plImGuiPipelineInitInfo
+{
+    plRenderAttachmentInfo* ptRenderAttachmentInfo;
+    plSampleCount eMsaaSamples;
+} plImGuiPipelineInitInfo;
+
+typedef struct _plImGuiGraphicsInitInfo
+{
+    plDevice*               ptDevice;
+    uint32_t                uImageCount;
+    plImGuiPipelineInitInfo tPipelineInfoMain;
+} plImGuiGraphicsInitInfo;
+
 #endif // PL_DEAR_IMGUI_EXT_H

extensions/pl_dear_imgui_ext.h

@@ -1294,7 +1294,7 @@ pl_starter_get_staging_buffer(uint64_t uSize, plBufferHandle* ptHandleOut, const
     }
 
     const plBufferDesc tStagingBufferDesc = {
-        .eUsage      = PL_BUFFER_USAGE_TRANSFER | PL_BUFFER_USAGE_STORAGE | PL_BUFFER_USAGE_UNIFORM,
+        .eUsage      = PL_BUFFER_USAGE_TRANSFER | PL_BUFFER_USAGE_STORAGE | PL_BUFFER_USAGE_UNIFORM | PL_BUFFER_USAGE_INDEX | PL_BUFFER_USAGE_VERTEX,
         .szByteSize  = uSize,
         .pcDebugName = pcName
     };

extensions/pl_starter_ext.c

@@ -323,9 +323,7 @@ pl_app_load(plApiRegistryI* ptApiRegistry, plAppData* ptAppData)
 
     pl__find_models(ptAppData);
 
-    plRenderAttachmentInfo tRenderInfo = {};
-    gptStarter->get_render_attachment_info(&tRenderInfo);
-    gptDearImGui->initialize(ptAppData->ptDevice, gptStarter->get_swapchain(), &tRenderInfo);
+    gptDearImGui->initialize(nullptr);
     // ImGui::GetIO().ConfigFlags &= ~ImGuiBackendFlags_PlatformHasViewports;
     ImPlot::SetCurrentContext((ImPlotContext*)ptDataRegistry->get_data("implot"));
     ImGuiIO& tImGuiIO = ImGui::GetIO();
@@ -713,7 +711,7 @@ pl_app_update(plAppData* ptAppData)
 
             plVec2 tUV = {};
             plBindGroupHandle tTextureHandle = gptRenderer->get_view_color_bind_group(ptAppData->ptView, &tUV);
-            ImTextureRef tTexture = ImTextureRef(gptDearImGui->get_texture_id_from_bindgroup(ptAppData->ptDevice, tTextureHandle));
+            ImTextureRef tTexture = ImTextureRef(tTextureHandle.uData);
             ImGui::Image(tTexture, tContextSize, ImVec2(0, 0), ImVec2(tUV.x, tUV.y));
 
         }
@@ -730,7 +728,7 @@ pl_app_update(plAppData* ptAppData)
             ImVec2 tContextSize = ImGui::GetContentRegionAvail();
             gptCamera->set_viewport((plCamera*)gptEcs->get_component(ptAppData->ptCompLibrary, gptCameraEcs->get_ecs_type_key(), ptAppData->tSecondaryCamera), tContextSize.x, tContextSize.y);
 
-            ImTextureRef tTexture = ImTextureRef(gptDearImGui->get_texture_id_from_bindgroup(ptAppData->ptDevice, tTextureHandle));
+            ImTextureRef tTexture = ImTextureRef(tTextureHandle.uData);
             ImGui::Image(tTexture, tContextSize, ImVec2(0, 0), ImVec2(tUV.x, tUV.y));
         }
         ImGui::End();

internal/demo/demo.cpp

@@ -331,7 +331,7 @@ int main(int argc, char *argv[])
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableKeyboard; // Enable Keyboard Controls
     io.ConfigFlags |= ImGuiConfigFlags_NavEnableGamepad;  // Enable Gamepad Controls
     io.ConfigFlags |= ImGuiConfigFlags_DockingEnable;     // Enable Docking
-    io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;   // Enable Multi-Viewport / Platform Windows
+    // io.ConfigFlags |= ImGuiConfigFlags_ViewportsEnable;   // Enable Multi-Viewport / Platform Windows
     //io.ConfigViewportsNoAutoMerge = true;
     //io.ConfigViewportsNoTaskBarIcon = true;
 
@@ -754,13 +754,13 @@ pl_create_window(plWindowDesc tDesc, plWindow** pptWindowOut)
     glfwSetWindowIconifyCallback(ptGlfwWindow, pl_glfw_window_iconified_callback);
     glfwSetWindowCloseCallback(ptGlfwWindow, pl_glfw_window_close_callback);
 
-    #ifdef PL_METAL_BACKEND
-    if(pl_sb_size(gsbtWindows) == 0)
+    // #ifdef PL_METAL_BACKEND
+    // if(pl_sb_size(gsbtWindows) == 0)
         ImGui_ImplGlfw_InitForOther(ptGlfwWindow, true);
-    #else
-    if(pl_sb_size(gsbtWindows) == 0)
-        ImGui_ImplGlfw_InitForVulkan(ptGlfwWindow, true);
-    #endif
+    // #else
+    // if(pl_sb_size(gsbtWindows) == 0)
+    //     ImGui_ImplGlfw_InitForVulkan(ptGlfwWindow, true);
+    // #endif
 
     #ifdef _WIN32
     HWND tHandle = glfwGetWin32Window(ptGlfwWindow);

src/pl_main_glfw.cpp

@@ -14,6 +14,10 @@
 
 #pragma once
 
+#include <stdint.h>
+#define ImTextureID uint32_t
+#define ImDrawIdx uint32_t
+
 //---- Define assertion handler. Defaults to calling assert().
 // - If your macro uses multiple statements, make sure is enclosed in a 'do { .. } while (0)' block so it can be used as a single statement.
 // - Compiling with NDEBUG will usually strip out assert() to nothing, which is NOT recommended because we use asserts to notify of programmer mistakes.