Бранимир Караџић 1 year ago
parent
commit
3f9fe0d34e
3 changed files with 3 additions and 12 deletions
  1. 0 4
      src/glcontext_egl.cpp
  2. 2 6
      src/renderer_vk.cpp
  3. 1 2
      src/renderer_vk.h

+ 0 - 4
src/glcontext_egl.cpp

@@ -27,10 +27,6 @@
 #	define EGL_CHECK(_call) _call
 #endif // BGFX_CONFIG_DEBUG
 
-#if defined(WL_EGL_PLATFORM)
-#	include <wayland-egl.h>
-#endif // defined(WL_EGL_PLATFORM)
-
 namespace bgfx { namespace gl
 {
 #ifndef EGL_CONTEXT_FLAG_NO_ERROR_BIT_KHR

+ 2 - 6
src/renderer_vk.cpp

@@ -17,10 +17,6 @@
 #	import <Metal/Metal.h>
 #endif // BX_PLATFORM_OSX
 
-#if defined(WL_EGL_PLATFORM)
-#	include <wayland-egl-backend.h>
-#endif // defined(WL_EGL_PLATFORM)
-
 namespace bgfx { namespace vk
 {
 	static char s_viewName[BGFX_CONFIG_MAX_VIEWS][BGFX_CONFIG_MAX_VIEW_NAME];
@@ -6932,7 +6928,7 @@ VK_DESTROY
 		}
 #elif BX_PLATFORM_LINUX
 		{
-#if     defined(WL_EGL_PLATFORM)
+#	if defined(WL_EGL_PLATFORM)
 			if (g_platformData.type == bgfx::NativeWindowHandleType::Wayland)
 			{
 				VkWaylandSurfaceCreateInfoKHR sci;
@@ -6944,7 +6940,7 @@ VK_DESTROY
 				result = vkCreateWaylandSurfaceKHR(instance, &sci, allocatorCb, &m_surface);
 			}
 			else
-#endif // defined(WL_EGL_PLATFORM)
+#	endif // defined(WL_EGL_PLATFORM)
 			{
 				if (NULL != vkCreateXlibSurfaceKHR)
 				{

+ 1 - 2
src/renderer_vk.h

@@ -17,8 +17,7 @@
 #	define VK_USE_PLATFORM_XLIB_KHR
 #	define VK_USE_PLATFORM_XCB_KHR
 #	if defined(WL_EGL_PLATFORM)
-#		define KHR_SURFACE_EXTENSION_NAME VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME, \
-		VK_KHR_XCB_SURFACE_EXTENSION_NAME
+#		define KHR_SURFACE_EXTENSION_NAME VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME
 #	else
 #		define KHR_SURFACE_EXTENSION_NAME VK_KHR_XCB_SURFACE_EXTENSION_NAME
 #	endif // defined(WL_EGL_PLATFORM)