From af9d39c250fa5df7d7aced408922afec65a4be2b Mon Sep 17 00:00:00 2001
From: Julian Sikorski <belegdol+github@gmail.com>
Date: Thu, 17 Aug 2023 22:12:14 +0200
Subject: [PATCH] Use WL_EGL_PLATFORM consistently with Khronos (#3161)

---
 3rdparty/bgfx/src/renderer_vk.cpp | 10 +++++-----
 3rdparty/bgfx/src/renderer_vk.h   | 16 ++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/3rdparty/bgfx/src/renderer_vk.cpp b/3rdparty/bgfx/src/renderer_vk.cpp
index 18c2c180601..7be6e332940 100644
--- a/3rdparty/bgfx/src/renderer_vk.cpp
+++ b/3rdparty/bgfx/src/renderer_vk.cpp
@@ -17,9 +17,9 @@
 #	import <Metal/Metal.h>
 #endif // BX_PLATFORM_OSX
 
-#if WL_EGL_PLATFORM
+#if defined(WL_EGL_PLATFORM)
 #	include <wayland-egl-backend.h>
-#endif // WL_EGL_PLATFORM
+#endif // defined(WL_EGL_PLATFORM)
 
 namespace bgfx { namespace vk
 {
@@ -1230,7 +1230,7 @@ VK_IMPORT
 						BX_TRACE("\t%s", layer.m_name);
 					}
 				}
-#if BX_PLATFORM_OSX || WL_EGL_PLATFORM
+#if BX_PLATFORM_OSX || defined(WL_EGL_PLATFORM)
 				uint32_t numEnabledExtensions = headless ? 0 : 3;
 
 				const char* enabledExtension[Extension::Count + 3] =
@@ -6777,7 +6777,7 @@ VK_DESTROY
 		}
 #elif BX_PLATFORM_LINUX
 		{
-#if     WL_EGL_PLATFORM
+#if     defined(WL_EGL_PLATFORM)
 			if (g_platformData.type == bgfx::NativeWindowHandleType::Wayland)
 			{
 				VkWaylandSurfaceCreateInfoKHR sci;
@@ -6789,7 +6789,7 @@ VK_DESTROY
 				result = vkCreateWaylandSurfaceKHR(instance, &sci, allocatorCb, &m_surface);
 			}
 			else
-#endif // WL_EGL_PLATFORM
+#endif // defined(WL_EGL_PLATFORM)
 			{
 				if (NULL != vkCreateXlibSurfaceKHR)
 				{
diff --git a/3rdparty/bgfx/src/renderer_vk.h b/3rdparty/bgfx/src/renderer_vk.h
index 253bd51907a..3f0c75dc361 100644
--- a/3rdparty/bgfx/src/renderer_vk.h
+++ b/3rdparty/bgfx/src/renderer_vk.h
@@ -6,26 +6,22 @@
 #ifndef BGFX_RENDERER_VK_H_HEADER_GUARD
 #define BGFX_RENDERER_VK_H_HEADER_GUARD
 
-#ifndef WL_EGL_PLATFORM
-#	define WL_EGL_PLATFORM 0
-#endif // WL_EGL_PLATFORM
-
 #if BX_PLATFORM_ANDROID
 #	define VK_USE_PLATFORM_ANDROID_KHR
 #	define KHR_SURFACE_EXTENSION_NAME VK_KHR_ANDROID_SURFACE_EXTENSION_NAME
 #	define VK_IMPORT_INSTANCE_PLATFORM VK_IMPORT_INSTANCE_ANDROID
 #elif BX_PLATFORM_LINUX
-#	if WL_EGL_PLATFORM
+#	if defined(WL_EGL_PLATFORM)
 #		define VK_USE_PLATFORM_WAYLAND_KHR
-#	endif // WL_EGL_PLATFORM
+#	endif // defined(WL_EGL_PLATFORM)
 #	define VK_USE_PLATFORM_XLIB_KHR
 #	define VK_USE_PLATFORM_XCB_KHR
-#	if WL_EGL_PLATFORM
+#	if defined(WL_EGL_PLATFORM)
 #		define KHR_SURFACE_EXTENSION_NAME VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, \
 		VK_KHR_XCB_SURFACE_EXTENSION_NAME
 #	else
 #		define KHR_SURFACE_EXTENSION_NAME VK_KHR_XCB_SURFACE_EXTENSION_NAME
-#	endif // WL_EGL_PLATFORM
+#	endif // defined(WL_EGL_PLATFORM)
 #	define VK_IMPORT_INSTANCE_PLATFORM VK_IMPORT_INSTANCE_LINUX
 #elif BX_PLATFORM_WINDOWS
 #	define VK_USE_PLATFORM_WIN32_KHR
@@ -73,7 +69,7 @@
 			/* VK_KHR_android_surface */                               \
 			VK_IMPORT_INSTANCE_FUNC(true,  vkCreateAndroidSurfaceKHR); \
 
-#if WL_EGL_PLATFORM
+#if defined(WL_EGL_PLATFORM)
 #define VK_IMPORT_INSTANCE_LINUX                                                              \
 			/* VK_KHR_wayland_surface */                                                      \
 			VK_IMPORT_INSTANCE_FUNC(true,  vkCreateWaylandSurfaceKHR);                        \
@@ -94,7 +90,7 @@
 			VK_IMPORT_INSTANCE_FUNC(true,  vkCreateXcbSurfaceKHR);                         \
 			VK_IMPORT_INSTANCE_FUNC(true,  vkGetPhysicalDeviceXcbPresentationSupportKHR);  \
 
-#endif // WL_EGL_PLATFORM
+#endif // defined(WL_EGL_PLATFORM)
 
 #define VK_IMPORT_INSTANCE_WINDOWS                                                          \
 			/* VK_KHR_win32_surface */                                                      \