Skip to content

Commit

Permalink
Remove unsupported platforms.
Browse files Browse the repository at this point in the history
  • Loading branch information
bkaradzic committed Nov 4, 2023
1 parent 4946079 commit de9f4b3
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 17 deletions.
10 changes: 5 additions & 5 deletions examples/common/entry/entry_glfw.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# error "GLFW 3.2 or later is required"
#endif // GLFW_VERSION_MINOR < 2

#if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
#if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
# include <wayland-egl.h>
# define GLFW_EXPOSE_NATIVE_WAYLAND
Expand Down Expand Up @@ -44,7 +44,7 @@ namespace entry
{
static void* glfwNativeWindowHandle(GLFWwindow* _window)
{
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
wl_egl_window *win_impl = (wl_egl_window*)glfwGetWindowUserPointer(_window);
if(!win_impl)
Expand Down Expand Up @@ -72,7 +72,7 @@ namespace entry
{
if(!_window)
return;
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
wl_egl_window *win_impl = (wl_egl_window*)glfwGetWindowUserPointer(_window);
if(win_impl)
Expand Down Expand Up @@ -864,7 +864,7 @@ namespace entry

void* getNativeDisplayHandle()
{
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
return glfwGetWaylandDisplay();
# else
Expand All @@ -877,7 +877,7 @@ namespace entry

bgfx::NativeWindowHandleType::Enum getNativeWindowHandleType()
{
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
return bgfx::NativeWindowHandleType::Wayland;
# else
Expand Down
10 changes: 5 additions & 5 deletions examples/common/entry/entry_sdl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

#if ENTRY_CONFIG_USE_SDL

#if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
#if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
# include <wayland-egl.h>
# endif
Expand Down Expand Up @@ -48,7 +48,7 @@ namespace entry
return NULL;
}

# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
if (wmi.subsystem == SDL_SYSWM_WAYLAND)
{
Expand Down Expand Up @@ -81,7 +81,7 @@ namespace entry
{
if(!_window)
return;
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
wl_egl_window *win_impl = (wl_egl_window*)SDL_GetWindowData(_window, "wl_egl_window");
if(win_impl)
Expand Down Expand Up @@ -1148,7 +1148,7 @@ namespace entry
{
return NULL;
}
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
if (wmi.subsystem == SDL_SYSWM_WAYLAND)
return wmi.info.wl.display;
Expand All @@ -1168,7 +1168,7 @@ namespace entry
{
return bgfx::NativeWindowHandleType::Default;
}
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# if ENTRY_CONFIG_USE_WAYLAND
if (wmi.subsystem == SDL_SYSWM_WAYLAND)
{
Expand Down
4 changes: 2 additions & 2 deletions examples/common/entry/entry_x11.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

#include "entry_p.h"

#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_BSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
#if ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_LINUX || BX_PLATFORM_RPI)

#define XK_MISCELLANY
#define XK_LATIN1
Expand Down Expand Up @@ -784,4 +784,4 @@ int main(int _argc, const char* const* _argv)
return s_ctx.run(_argc, _argv);
}

#endif // ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_BSD || BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
#endif // ENTRY_CONFIG_USE_NATIVE && (BX_PLATFORM_LINUX || BX_PLATFORM_RPI)
1 change: 0 additions & 1 deletion include/bgfx/embedded_shader.h
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
|| BX_PLATFORM_WINDOWS \
)
#define BGFX_PLATFORM_SUPPORTS_GLSL (0 \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_OSX \
|| BX_PLATFORM_WINDOWS \
Expand Down
1 change: 0 additions & 1 deletion src/config.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,6 @@

# ifndef BGFX_CONFIG_RENDERER_OPENGL
# define BGFX_CONFIG_RENDERER_OPENGL (0 \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_WINDOWS \
? BGFX_CONFIG_RENDERER_OPENGL_MIN_VERSION : 0)
Expand Down
4 changes: 1 addition & 3 deletions src/renderer_gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#define BGFX_USE_EGL ( (BGFX_CONFIG_RENDERER_OPENGL || BGFX_CONFIG_RENDERER_OPENGLES) && (0 \
|| BX_PLATFORM_ANDROID \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_NX \
|| BX_PLATFORM_RPI \
Expand All @@ -23,7 +22,6 @@
) )

#define BGFX_USE_GL_DYNAMIC_LIB (0 \
|| BX_PLATFORM_BSD \
|| BX_PLATFORM_LINUX \
|| BX_PLATFORM_WINDOWS \
)
Expand Down Expand Up @@ -62,7 +60,7 @@
# if BGFX_CONFIG_RENDERER_OPENGL >= 31
# include <gl/glcorearb.h>
# else
# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD
# if BX_PLATFORM_LINUX
# define GL_PROTOTYPES
# define GL_GLEXT_LEGACY
# include <GL/gl.h>
Expand Down

0 comments on commit de9f4b3

Please sign in to comment.