Skip to content

Commit

Permalink
Cleanup.
Browse files Browse the repository at this point in the history
  • Loading branch information
bkaradzic committed Oct 1, 2024
1 parent 54ab573 commit 3f9fe0d
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 12 deletions.
4 changes: 0 additions & 4 deletions src/glcontext_egl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 2 additions & 6 deletions src/renderer_vk.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down Expand Up @@ -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;
Expand All @@ -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)
{
Expand Down
3 changes: 1 addition & 2 deletions src/renderer_vk.h
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 3f9fe0d

Please sign in to comment.