zgui update to dear imgui 1.91.8 (#740)

hazeycode · web-flow · commit a23f7fee9e25 · 2025-02-06T23:31:18.000Z
zgui D3d12 backend breaking change introduced by upgrade to Dear Imgui 1.91.8. See zig-gamedev/zgui#15
diff --git a/build.zig.zon b/build.zig.zon
@@ -77,8 +77,8 @@
         },
 
         .zgui = .{
-            .url = "https://github.com/zig-gamedev/zgui/archive/5fb1c3b935b311e88352b0ffee29e7ad56da9722.tar.gz",
-            .hash = "12204f82e0475ddfd6a57d97f74bcf9052452c0eb2fa863cf0e3bce1071d2603e9f4",
+            .url = "https://github.com/zig-gamedev/zgui/archive/6763f8a059efe96951700731a8a3efb8a99a8ceb.tar.gz",
+            .hash = "1220c209784531fdf9eab84ca0a985adc98dc0b3c22fa477b54714036fe549b7eeb5",
         },
 
         .zjobs = .{
diff --git a/libs/zgui b/libs/zgui
@@ -1 +1 @@
-Subproject commit c16629e67e7bc1bca9a5c67d5123874c75f5374d
+Subproject commit 6763f8a059efe96951700731a8a3efb8a99a8ceb
diff --git a/samples/minimal_zgui_glfw_d3d12/src/minimal_zgui_glfw_d3d12.zig b/samples/minimal_zgui_glfw_d3d12/src/minimal_zgui_glfw_d3d12.zig
@@ -61,12 +61,16 @@ pub fn main() !void {
         const cbv_srv = gctx.cbv_srv_uav_gpu_heaps[0];
         zgui.backend.init(
             glfw_window,
-            gctx.device,
-            zd3d12.GraphicsContext.max_num_buffered_frames,
-            @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
-            cbv_srv.heap.?,
-            @bitCast(cbv_srv.base.cpu_handle),
-            @bitCast(cbv_srv.base.gpu_handle),
+            .{
+                .device = gctx.device,
+                .command_queue = gctx.cmdqueue,
+                .num_frames_in_flight = zd3d12.GraphicsContext.max_num_buffered_frames,
+                .rtv_format = @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
+                .dsv_format = @intFromEnum(dxgi.FORMAT.D32_FLOAT),
+                .cbv_srv_heap = cbv_srv.heap.?,
+                .font_srv_cpu_desc_handle = @bitCast(cbv_srv.base.cpu_handle),
+                .font_srv_gpu_desc_handle = @bitCast(cbv_srv.base.gpu_handle),
+            },
         );
     }
     defer zgui.backend.deinit();
diff --git a/samples/minimal_zgui_win32_d3d12/src/minimal_zgui_win32_d3d12.zig b/samples/minimal_zgui_win32_d3d12/src/minimal_zgui_win32_d3d12.zig
@@ -52,12 +52,16 @@ pub fn main() !void {
     const cbv_srv = gctx.cbv_srv_uav_gpu_heaps[0];
     zgui.backend.init(
         window,
-        gctx.device,
-        zd3d12.GraphicsContext.max_num_buffered_frames,
-        @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
-        cbv_srv.heap.?,
-        @bitCast(cbv_srv.base.cpu_handle),
-        @bitCast(cbv_srv.base.gpu_handle),
+        .{
+            .device = gctx.device,
+            .command_queue = gctx.cmdqueue,
+            .num_frames_in_flight = zd3d12.GraphicsContext.max_num_buffered_frames,
+            .rtv_format = @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
+            .dsv_format = @intFromEnum(dxgi.FORMAT.D32_FLOAT),
+            .cbv_srv_heap = cbv_srv.heap.?,
+            .font_srv_cpu_desc_handle = @bitCast(cbv_srv.base.cpu_handle),
+            .font_srv_gpu_desc_handle = @bitCast(cbv_srv.base.gpu_handle),
+        },
     );
     defer zgui.backend.deinit();
 
diff --git a/samples/openvr_test/src/openvr_test.zig b/samples/openvr_test/src/openvr_test.zig
@@ -47,12 +47,16 @@ const Surface = struct {
             const cbv_srv = gctx.cbv_srv_uav_gpu_heaps[0];
             zgui.backend.init(
                 window,
-                gctx.device,
-                zd3d12.GraphicsContext.max_num_buffered_frames,
-                @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
-                cbv_srv.heap.?,
-                @bitCast(cbv_srv.base.cpu_handle),
-                @bitCast(cbv_srv.base.gpu_handle),
+                .{
+                    .device = gctx.device,
+                    .command_queue = gctx.cmdqueue,
+                    .num_frames_in_flight = zd3d12.GraphicsContext.max_num_buffered_frames,
+                    .rtv_format = @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
+                    .dsv_format = @intFromEnum(dxgi.FORMAT.D32_FLOAT),
+                    .cbv_srv_heap = cbv_srv.heap.?,
+                    .font_srv_cpu_desc_handle = @bitCast(cbv_srv.base.cpu_handle),
+                    .font_srv_gpu_desc_handle = @bitCast(cbv_srv.base.gpu_handle),
+                },
             );
         }
 
diff --git a/samples/zphysics_instanced_cubes_d3d12/src/zphysics_instanced_cubes_d3d12.zig b/samples/zphysics_instanced_cubes_d3d12/src/zphysics_instanced_cubes_d3d12.zig
@@ -297,12 +297,16 @@ pub fn main() !void {
         const cbv_srv = gctx.cbv_srv_uav_gpu_heaps[0];
         zgui.backend.init(
             glfw_window,
-            gctx.device,
-            zd3d12.GraphicsContext.max_num_buffered_frames,
-            @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
-            cbv_srv.heap.?,
-            @bitCast(cbv_srv.base.cpu_handle),
-            @bitCast(cbv_srv.base.gpu_handle),
+            .{
+                .device = gctx.device,
+                .command_queue = gctx.cmdqueue,
+                .num_frames_in_flight = zd3d12.GraphicsContext.max_num_buffered_frames,
+                .rtv_format = @intFromEnum(dxgi.FORMAT.R8G8B8A8_UNORM),
+                .dsv_format = @intFromEnum(dxgi.FORMAT.D32_FLOAT),
+                .cbv_srv_heap = cbv_srv.heap.?,
+                .font_srv_cpu_desc_handle = @bitCast(cbv_srv.base.cpu_handle),
+                .font_srv_gpu_desc_handle = @bitCast(cbv_srv.base.gpu_handle),
+            },
         );
     }
     defer zgui.backend.deinit();
