This commit is contained in:
Бранимир Караџић 2024-10-01 16:23:25 -07:00
parent 54ab573055
commit 3f9fe0d34e
3 changed files with 3 additions and 12 deletions

View File

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

View File

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

View File

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