From 3f9fe0d34e5e84c11ffb0c98942049847ff69324 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=91=D1=80=D0=B0=D0=BD=D0=B8=D0=BC=D0=B8=D1=80=20=D0=9A?= =?UTF-8?q?=D0=B0=D1=80=D0=B0=D1=9F=D0=B8=D1=9B?= Date: Tue, 1 Oct 2024 16:23:25 -0700 Subject: [PATCH] Cleanup. --- src/glcontext_egl.cpp | 4 ---- src/renderer_vk.cpp | 8 ++------ src/renderer_vk.h | 3 +-- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/src/glcontext_egl.cpp b/src/glcontext_egl.cpp index 98aaafed3..ec7e9043c 100644 --- a/src/glcontext_egl.cpp +++ b/src/glcontext_egl.cpp @@ -27,10 +27,6 @@ # define EGL_CHECK(_call) _call #endif // BGFX_CONFIG_DEBUG -#if defined(WL_EGL_PLATFORM) -# include -#endif // defined(WL_EGL_PLATFORM) - namespace bgfx { namespace gl { #ifndef EGL_CONTEXT_FLAG_NO_ERROR_BIT_KHR diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp index 0a55c663e..aeae00cc5 100644 --- a/src/renderer_vk.cpp +++ b/src/renderer_vk.cpp @@ -17,10 +17,6 @@ # import #endif // BX_PLATFORM_OSX -#if defined(WL_EGL_PLATFORM) -# include -#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) { diff --git a/src/renderer_vk.h b/src/renderer_vk.h index 244faf0ad..6e47d8558 100644 --- a/src/renderer_vk.h +++ b/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)