Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Use WL_EGL_PLATFORM consistently with Khronos (#3161)

Browse source
This commit is contained in:
Julian Sikorski 2023-08-17 22:12:14 +02:00
parent faf2ee577c
commit af9d39c250
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
3rdparty/bgfx/src/renderer_vk.cpp vendored
View file

@ -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)
{

16
3rdparty/bgfx/src/renderer_vk.h vendored
View file

@ -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 */ \