Update bgfx.

Author: jpcy

bin/shaderc.exe

@@ -63,15 +63,23 @@
 					? 1 : 0)
 #	endif // BGFX_CONFIG_RENDERER_NVN
 
+#	ifndef BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION
+#		define BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION 1
+#	endif // BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION
+
 #	ifndef BGFX_CONFIG_RENDERER_OPENGL
 #		define BGFX_CONFIG_RENDERER_OPENGL (0 \
 					|| BX_PLATFORM_BSD        \
 					|| BX_PLATFORM_LINUX      \
 					|| BX_PLATFORM_OSX        \
 					|| BX_PLATFORM_WINDOWS    \
-					? 1 : 0)
+					? BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION : 0)
 #	endif // BGFX_CONFIG_RENDERER_OPENGL
 
+#	ifndef BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION
+#		define BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION 1
+#	endif // BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION
+
 #	ifndef BGFX_CONFIG_RENDERER_OPENGLES
 #		define BGFX_CONFIG_RENDERER_OPENGLES (0 \
 					|| BX_PLATFORM_ANDROID      \
@@ -80,7 +88,7 @@
 					|| BX_PLATFORM_RPI          \
 					|| BX_PLATFORM_STEAMLINK    \
 					|| BX_PLATFORM_NX           \
-					? 1 : 0)
+					? BGFX_CONFIG_RENDERER_OPENGLES_MIN_VERSION : 0)
 #	endif // BGFX_CONFIG_RENDERER_OPENGLES
 
 #	ifndef BGFX_CONFIG_RENDERER_VULKAN

code/bgfx/src/config.h

@@ -3069,10 +3069,15 @@ void writeString(bx::WriterI* _writer, const char* _str)
 	void SwapChainMtl::resize(FrameBufferMtl &_frameBuffer, uint32_t _width, uint32_t _height, uint32_t _flags)
 	{
 		const int32_t sampleCount = s_msaa[(_flags&BGFX_RESET_MSAA_MASK)>>BGFX_RESET_MSAA_SHIFT];
-
-#if BX_PLATFORM_OSX > 101300
-		m_metalLayer.displaySyncEnabled = 0 != (_flags&BGFX_RESET_VSYNC);
-#endif // BX_PLATFORM_OSX > 101300
+		
+#if BX_PLATFORM_OSX
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+		if (@available(macOS 10.13, *))
+		{
+			m_metalLayer.displaySyncEnabled = 0 != (_flags&BGFX_RESET_VSYNC);
+		}
+#endif // __MAC_OS_X_VERSION_MAX_ALLOWED >= 101300
+#endif // BX_PLATFORM_OSX
 
 		m_metalLayer.drawableSize = CGSizeMake(_width, _height);
 		m_metalLayer.pixelFormat = (_flags & BGFX_RESET_SRGB_BACKBUFFER)

code/bgfx/src/renderer_mtl.mm

@@ -1377,9 +1377,18 @@ VK_IMPORT_INSTANCE
 				g_caps.deviceId = uint16_t(m_deviceProperties.deviceID);
 
 				g_caps.supported |= ( 0
-					| BGFX_CAPS_TEXTURE_BLIT
+					| BGFX_CAPS_ALPHA_TO_COVERAGE
+					| BGFX_CAPS_BLEND_INDEPENDENT
+					| BGFX_CAPS_COMPUTE
 					| BGFX_CAPS_DRAW_INDIRECT
+					| BGFX_CAPS_FRAGMENT_DEPTH
 					| BGFX_CAPS_INSTANCING
+					| BGFX_CAPS_TEXTURE_3D
+					| BGFX_CAPS_TEXTURE_BLIT
+					| BGFX_CAPS_TEXTURE_COMPARE_ALL
+					| BGFX_CAPS_VERTEX_ATTRIB_HALF
+					| BGFX_CAPS_VERTEX_ATTRIB_UINT10
+					| BGFX_CAPS_VERTEX_ID
 					);
 				g_caps.limits.maxTextureSize     = m_deviceProperties.limits.maxImageDimension2D;
 				g_caps.limits.maxFBAttachments   = bx::min(uint8_t(m_deviceProperties.limits.maxFragmentOutputAttachments), uint8_t(BGFX_CONFIG_MAX_FRAME_BUFFER_ATTACHMENTS) );
@@ -2301,20 +2310,17 @@ VK_IMPORT_DEVICE
 				pi.sType = VK_STRUCTURE_TYPE_PRESENT_INFO_KHR;
 				pi.pNext = NULL;
 				pi.waitSemaphoreCount = 0;
-				pi.pWaitSemaphores    = NULL; //&m_presentDone[0];
+				pi.pWaitSemaphores    = NULL;
 				pi.swapchainCount = 1;
 				pi.pSwapchains    = &m_swapchain;
 				pi.pImageIndices  = &m_backBufferColorIdx;
 				pi.pResults       = NULL;
 				VkResult result = vkQueuePresentKHR(m_queueGraphics, &pi);
-				if (VK_ERROR_OUT_OF_DATE_KHR == result || VK_SUBOPTIMAL_KHR == result)
+				if (VK_ERROR_OUT_OF_DATE_KHR == result
+				||  VK_SUBOPTIMAL_KHR        == result)
 				{
 					m_needToRefreshSwapchain = true;
 				}
-				else
-				{
-					VK_CHECK(result);
-				}
 			}
 		}
 
@@ -2613,13 +2619,14 @@ VK_IMPORT_DEVICE
 			uint32_t samplerFlags = (uint32_t)(texture.m_flags & BGFX_SAMPLER_BITS_MASK);
 			VkSampler sampler = getSampler(samplerFlags, 1);
 
+			const uint32_t size = bx::strideAlign(program.m_vsh->m_size, align);
 			uint32_t bufferOffset = scratchBuffer.m_pos;
 			VkDescriptorBufferInfo bufferInfo;
 			bufferInfo.buffer = scratchBuffer.m_buffer;
 			bufferInfo.offset = 0;
-			bufferInfo.range  = bx::strideAlign(program.m_vsh->m_size, align);
+			bufferInfo.range  = size;
 			bx::memCopy(&scratchBuffer.m_data[scratchBuffer.m_pos], m_vsScratch, program.m_vsh->m_size);
-			scratchBuffer.m_pos += bufferInfo.range;
+			scratchBuffer.m_pos += size;
 
 			VkWriteDescriptorSet wds[3];
 			wds[0].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET;
@@ -5461,7 +5468,7 @@ VK_DESTROY
 		void* directAccessPtr = NULL;
 		VK_CHECK(vkBindBufferMemory(device, stagingBuffer, stagingDeviceMem, 0));
 		VK_CHECK(vkMapMemory(device, stagingDeviceMem, 0, ma.allocationSize, 0, (void**)&directAccessPtr));
-		bx::memCopy(directAccessPtr, _mem->data, bci.size);
+		bx::memCopy(directAccessPtr, _mem->data, size_t(bci.size));
 		vkUnmapMemory(device, stagingDeviceMem);
 
 		const uint32_t bpp    = bimg::getBitsPerPixel(bimg::TextureFormat::Enum(m_textureFormat) );
@@ -5710,7 +5717,7 @@ VK_DESTROY
 		uint8_t primIndex = uint8_t(primType >> BGFX_STATE_PT_SHIFT);
 		PrimInfo prim = s_primInfo[primIndex];
 
-		bool wasCompute = false;
+		bool wasCompute     = false;
 		bool viewHasScissor = false;
 		bool restoreScissor = false;
 		Rect viewScissorRect;
@@ -5726,22 +5733,21 @@ VK_DESTROY
 		uint32_t statsKeyType[2] = {};
 
 		VkSemaphore renderWait = m_presentDone[m_backBufferColorIdx];
-		VkResult result = vkAcquireNextImageKHR(m_device
-				, m_swapchain
-				, UINT64_MAX
-				, renderWait
-				, VK_NULL_HANDLE
-				, &m_backBufferColorIdx
-				);
-		if (VK_ERROR_OUT_OF_DATE_KHR == result || VK_SUBOPTIMAL_KHR == result)
+		VkResult result = vkAcquireNextImageKHR(
+			  m_device
+			, m_swapchain
+			, UINT64_MAX
+			, renderWait
+			, VK_NULL_HANDLE
+			, &m_backBufferColorIdx
+			);
+
+		if (VK_ERROR_OUT_OF_DATE_KHR == result
+		||  VK_SUBOPTIMAL_KHR        == result)
 		{
 			m_needToRefreshSwapchain = true;
 			return;
 		}
-		else
-		{
-			VK_CHECK(result);
-		}
 
 //		const uint64_t f0 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_FACTOR, BGFX_STATE_BLEND_FACTOR);
 //		const uint64_t f1 = BGFX_STATE_BLEND_FUNC(BGFX_STATE_BLEND_INV_FACTOR, BGFX_STATE_BLEND_INV_FACTOR);