Upgrade BGFX. (#5)

Reviewed-on: https://codeberg.org/cyberegoorg/zbgfx/pulls/5
Co-authored-by: Ondra Voves <email@ondravoves.cz>
Co-committed-by: Ondra Voves <email@ondravoves.cz>

Author: OndraVoves

.github/workflows/test.yaml

@@ -38,7 +38,7 @@ jobs:
     timeout-minutes: 3
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: true
 
@@ -63,7 +63,7 @@ jobs:
     timeout-minutes: 15
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: false
 

README.md

@@ -40,7 +40,7 @@ Minimal is `0.15.1`. But you know try your version and believe.
 
 - [BX](https://github.com/bkaradzic/bx/compare/cac72f6cfa0893393ea12692ebfacb4495f8c826...master)
 - [BImg](https://github.com/bkaradzic/bimg/compare/9114b47f532ce59cd0c6c9f8932df2c48888d4c1...master)
-- [BGFX](https://github.com/bkaradzic/bgfx/compare/a7016487e5970c5299bb837f1af42dcb24909a67...master)
+- [BGFX](https://github.com/bkaradzic/bgfx/compare/8532b2c45d2f4332a9ac9734b85c2ea2253cb8d5...master)
 
 ## Getting started
 
@@ -55,16 +55,15 @@ or use `zig fetch --save ...` way.
 Then in your `build.zig` add:
 
 ```zig
+const zbgfx = @import("zbgfx");
+
 pub fn build(b: *std.Build) void {
     const exe = b.addExecutable(.{ ... });
 
-    const zbgfx = b.dependency("zbgfx", .{});
-    exe.root_module.addImport("zbgfx", zbgfx.module("zbgfx"));
+    const zbgfx_dep = b.dependency("zbgfx", .{});
+    exe.root_module.addImport("zbgfx", zbgfx_dep.module("zbgfx"));
     exe.linkLibrary(zbgfx.artifact("bgfx"));
-
-    // This install shaderc to install dir
-    // For shader build in build =D check examples
-    // b.installArtifact(zbgfx.artifact("shaderc"));
+    _ = try zbgfx.build_step.installShaderc(b, zbgfx_dep);
 }
 ```
 

build.zig.zon

@@ -1,7 +1,7 @@
 .{
     .name = .zbgfx,
     .fingerprint = 0xc48ed871c4086e4a,
-    .version = "0.9.0",
+    .version = "0.10.0",
     .minimum_zig_version = "0.15.2",
     .paths = .{
         "includes",

libs/bgfx/src/bgfx.cpp

@@ -2405,7 +2405,8 @@ namespace bgfx
 		if (_forceNewEncoder
 		||  BGFX_API_THREAD_MAGIC != s_threadIndex)
 		{
-			bx::MutexScope scopeLock(m_encoderApiLock);
+			bx::MutexScope beginLockScope(m_encoderBeginLock);
+			bx::MutexScope encoderApiScope(m_encoderApiLock);
 
 			uint16_t idx = m_encoderHandle->alloc();
 			if (kInvalidHandle == idx)
@@ -2442,14 +2443,20 @@ namespace bgfx
 		m_encoder[0].end(true);
 
 #if BGFX_CONFIG_MULTITHREADED
-		bx::MutexScope resourceApiScope(m_resourceApiLock);
-
-		encoderApiWait();
+		m_encoderBeginLock.lock(); // don't let any bgfx::begin calls...
+		encoderApiWait();          // wait for all started encoders to return...
 		bx::MutexScope encoderApiScope(m_encoderApiLock);
+		m_encoderBeginLock.unlock();
+
+		bx::MutexScope resourceApiScope(m_resourceApiLock);
 #else
 		encoderApiWait();
 #endif // BGFX_CONFIG_MULTITHREADED
 
+		m_encoderHandle->reset();
+		const uint16_t idx = m_encoderHandle->alloc();
+		BX_ASSERT(0 == idx, "Internal encoder handle is not 0 (idx %d).", idx); BX_UNUSED(idx);
+
 		if (0 != (_flags & BGFX_FRAME_DISCARD) )
 		{
 			m_submit->m_numRenderItems = 0;
@@ -3344,7 +3351,7 @@ namespace bgfx
 					uint8_t skip;
 					_cmdbuf.read(skip);
 
-					uintptr_t external;
+					uint64_t external;
 					_cmdbuf.read(external);
 
 					void* ptr = m_renderCtx->createTexture(handle, mem, flags, skip, external);

libs/bgfx/src/bgfx_p.h

@@ -5921,16 +5921,13 @@ namespace bgfx
 			}
 
 			m_submit->m_perfStats.numEncoders = uint8_t(numEncoders);
-
-			m_encoderHandle->reset();
-			uint16_t idx = m_encoderHandle->alloc();
-			BX_ASSERT(0 == idx, "Internal encoder handle is not 0 (idx %d).", idx); BX_UNUSED(idx);
 		}
 
 		bx::Semaphore m_renderSem;
 		bx::Semaphore m_apiSem;
 		bx::Semaphore m_encoderEndSem;
 		bx::Mutex     m_encoderApiLock;
+		bx::Mutex     m_encoderBeginLock;
 		bx::Mutex     m_resourceApiLock;
 		bx::Thread    m_thread;
 #else

libs/bgfx/src/renderer_mtl.cpp

@@ -784,7 +784,7 @@ static_assert(BX_COUNTOF(s_accessNames) == Access::Count, "Invalid s_accessNames
 				g_caps.formats[TextureFormat::RGBA32F] &= ~(BGFX_CAPS_FORMAT_TEXTURE_FRAMEBUFFER_MSAA);
 			}
 
-			s_textureFormat[TextureFormat::D24S8].m_fmt = m_device->isDepth24Stencil8PixelFormatSupported()
+			s_textureFormat[TextureFormat::D24S8].m_fmt = BX_ENABLED(BX_PLATFORM_OSX) && m_device->isDepth24Stencil8PixelFormatSupported()
 				? MTL::PixelFormatDepth24Unorm_Stencil8
 				: MTL::PixelFormatDepth32Float_Stencil8
 				;

libs/bgfx/tools/shaderc/shaderc.cpp

@@ -2452,11 +2452,24 @@ namespace bgfx
 
 									bx::stringPrintf(code, "#version %d\n", need130 ? 130 : glsl_profile);
 
-									if (need130)
+									if (need130
+									||  glsl_profile >= 130)
 									{
+										bx::stringPrintf(code, "#define attribute in\n");
 										bx::stringPrintf(code, "#define varying %s\n"
 											, 'f' == _options.shaderType ? "in" : "out"
 											);
+										bx::stringPrintf(code
+											, "#define bgfxShadow2D(_sampler, _coord)     vec4_splat(texture(_sampler, _coord) )\n"
+											  "#define bgfxShadow2DProj(_sampler, _coord) vec4_splat(textureProj(_sampler, _coord) )\n"
+											);
+									}
+									else
+									{
+										bx::stringPrintf(code
+											, "#define bgfxShadow2D     shadow2D\n"
+											  "#define bgfxShadow2DProj shader2DProj\n"
+											);
 									}
 
 									if (usesInstanceID)
@@ -2547,21 +2560,6 @@ namespace bgfx
 											"#define textureCubeGrad   textureCubeGradEXT\n"
 											);
 									}
-
-									if (need130 || (glsl_profile >= 130) )
-									{
-										bx::stringPrintf(code
-											, "#define bgfxShadow2D(_sampler, _coord)     vec4_splat(texture(_sampler, _coord) )\n"
-											  "#define bgfxShadow2DProj(_sampler, _coord) vec4_splat(textureProj(_sampler, _coord) )\n"
-											);
-									}
-									else
-									{
-										bx::stringPrintf(code
-											, "#define bgfxShadow2D     shadow2D\n"
-											  "#define bgfxShadow2DProj shader2DProj\n"
-											);
-									}
 								}
 								else
 								{