Upgrade BGFX

Author: OndraVoves

.github/workflows/test.yaml

@@ -7,7 +7,6 @@ on:
   pull_request:
     branches:
       - main
-      - unstable
     paths:
       - ".github/workflows/**"
       - "src/**"
@@ -18,8 +17,6 @@ on:
       - "build.zig.zon"
 
   push:
-    branches:
-      - main
     paths:
       - ".github/workflows/**"
       - "src/**"

build.zig

@@ -264,7 +264,7 @@ pub fn build(b: *std.Build) !void {
         shaderc.addIncludePath(b.path("libs/bimg/include"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "include"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "src"));
-        shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/dxsdk/include"));
+        shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/directx-headers/include/directx"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/fcpp"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/glslang/glslang/Public"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/glslang/glslang/Include"));
@@ -275,6 +275,12 @@ pub fn build(b: *std.Build) !void {
         shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/spirv-tools/include"));
         shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/webgpu/include"));
 
+        if (target.result.os.tag == .linux or target.result.os.tag.isDarwin()) {
+            shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/d3d4linux/include"));
+            shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/directx-headers/include"));
+            shaderc.addIncludePath(b.path(bgfx_path ++ "3rdparty/directx-headers/include/wsl/stubs"));
+        }
+
         shaderc.addCSourceFiles(.{
             .files = &.{
                 bgfx_path ++ "src/shader.cpp",
@@ -283,10 +289,12 @@ pub fn build(b: *std.Build) !void {
                 bgfx_path ++ "src/vertexlayout.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc_glsl.cpp",
+                bgfx_path ++ "tools/shaderc/shaderc_dxil.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc_hlsl.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc_metal.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc_pssl.cpp",
                 bgfx_path ++ "tools/shaderc/shaderc_spirv.cpp",
+                bgfx_path ++ "tools/shaderc/shaderc_wgsl.cpp",
             },
             .flags = &cxx_options,
         });
@@ -1081,4 +1089,5 @@ const spirv_opt_files = .{
     spirv_opt_path ++ "source/val/validate_invalid_type.cpp",
     spirv_opt_path ++ "source/val/validate_graph.cpp",
     spirv_opt_path ++ "source/val/validate_logical_pointers.cpp",
+    spirv_opt_path ++ "source/val/validate_group.cpp",
 };

examples/00-minimal/src/main.zig

@@ -128,9 +128,15 @@ pub fn main() anyerror!u8 {
     //
     switch (builtin.target.os.tag) {
         .linux => {
-            bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Default;
-            bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
-            bgfx_init.platformData.ndt = zglfw.getX11Display();
+            if (zglfw.getPlatform() == .wayland) {
+                bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Wayland;
+                bgfx_init.platformData.nwh = zglfw.getWaylandWindow(window);
+                bgfx_init.platformData.ndt = zglfw.getWaylandDisplay();
+            } else {
+                bgfx_init.platformData.type = .Default;
+                bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
+                bgfx_init.platformData.ndt = zglfw.getX11Display();
+            }
         },
         .windows => {
             bgfx_init.platformData.nwh = zglfw.getWin32Window(window);
@@ -299,7 +305,7 @@ pub fn main() anyerror!u8 {
         }
 
         // Render Frame
-        _ = bgfx.frame(false);
+        _ = bgfx.frame(0);
     }
 
     return 0;

examples/01-zgui/src/main.zig

@@ -70,9 +70,15 @@ pub fn main() anyerror!u8 {
     //
     switch (builtin.target.os.tag) {
         .linux => {
-            bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Default;
-            bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
-            bgfx_init.platformData.ndt = zglfw.getX11Display();
+            if (zglfw.getPlatform() == .wayland) {
+                bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Wayland;
+                bgfx_init.platformData.nwh = zglfw.getWaylandWindow(window);
+                bgfx_init.platformData.ndt = zglfw.getWaylandDisplay();
+            } else {
+                bgfx_init.platformData.type = .Default;
+                bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
+                bgfx_init.platformData.ndt = zglfw.getX11Display();
+            }
         },
         .windows => {
             bgfx_init.platformData.nwh = zglfw.getWin32Window(window);
@@ -200,7 +206,7 @@ pub fn main() anyerror!u8 {
         backend_glfw_bgfx.draw();
 
         // Render Frame
-        _ = bgfx.frame(false);
+        _ = bgfx.frame(0);
     }
 
     return 0;

examples/02-runtime-shaderc/src/main.zig

@@ -171,9 +171,15 @@ pub fn main() anyerror!u8 {
     //
     switch (builtin.target.os.tag) {
         .linux => {
-            bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Default;
-            bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
-            bgfx_init.platformData.ndt = zglfw.getX11Display();
+            if (zglfw.getPlatform() == .wayland) {
+                bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Wayland;
+                bgfx_init.platformData.nwh = zglfw.getWaylandWindow(window);
+                bgfx_init.platformData.ndt = zglfw.getWaylandDisplay();
+            } else {
+                bgfx_init.platformData.type = .Default;
+                bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
+                bgfx_init.platformData.ndt = zglfw.getX11Display();
+            }
         },
         .windows => {
             bgfx_init.platformData.nwh = zglfw.getWin32Window(window);
@@ -360,7 +366,7 @@ pub fn main() anyerror!u8 {
         }
 
         // Render Frame
-        _ = bgfx.frame(false);
+        _ = bgfx.frame(0);
     }
 
     return 0;

examples/03-debugdraw/src/main.zig

@@ -66,9 +66,15 @@ pub fn main() anyerror!u8 {
     //
     switch (builtin.target.os.tag) {
         .linux => {
-            bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Default;
-            bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
-            bgfx_init.platformData.ndt = zglfw.getX11Display();
+            if (zglfw.getPlatform() == .wayland) {
+                bgfx_init.platformData.type = bgfx.NativeWindowHandleType.Wayland;
+                bgfx_init.platformData.nwh = zglfw.getWaylandWindow(window);
+                bgfx_init.platformData.ndt = zglfw.getWaylandDisplay();
+            } else {
+                bgfx_init.platformData.type = .Default;
+                bgfx_init.platformData.nwh = @ptrFromInt(zglfw.getX11Window(window));
+                bgfx_init.platformData.ndt = zglfw.getX11Display();
+            }
         },
         .windows => {
             bgfx_init.platformData.nwh = zglfw.getWin32Window(window);
@@ -243,7 +249,7 @@ pub fn main() anyerror!u8 {
         }
 
         // Render Frame
-        _ = bgfx.frame(false);
+        _ = bgfx.frame(0);
     }
 
     return 0;

libs/bgfx/3rdparty/d3d4linux/Makefile

@@ -0,0 +1,24 @@
+BINARIES = ../../tools/bin/windows/d3d4linux.exe
+
+INCLUDE = include/d3d4linux.h \
+          include/d3d4linux_common.h \
+          include/d3d4linux_enums.h \
+          include/d3d4linux_impl.h \
+          include/d3d4linux_types.h
+
+CXXFLAGS += -O2 -Wall -I./include -std=c++11
+
+ifeq ($(OS), Windows_NT)
+CXX := x86_64-w64-mingw32-c++
+LDFLAGS = -s -static-libgcc -static-libstdc++ -ldxguid -static -ld3dcompiler -static -lpthread
+else
+LDFLAGS = -g
+endif
+
+all: $(BINARIES)
+
+../../tools/bin/windows/d3d4linux.exe: d3d4linux.cpp $(INCLUDE) Makefile
+	x86_64-w64-mingw32-c++ $(CXXFLAGS) $(filter %.cpp, $^) -static -o $@ -ldxguid
+
+clean:
+	rm -f $(BINARIES)