diff --git a/examples/common/entry/entry_glfw.cpp b/examples/common/entry/entry_glfw.cpp index 0461dabc15..b0dada6e37 100644 --- a/examples/common/entry/entry_glfw.cpp +++ b/examples/common/entry/entry_glfw.cpp @@ -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 # define GLFW_EXPOSE_NATIVE_WAYLAND @@ -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) @@ -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) @@ -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 @@ -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 diff --git a/examples/common/entry/entry_sdl.cpp b/examples/common/entry/entry_sdl.cpp index 83c34f474c..9205b739f8 100644 --- a/examples/common/entry/entry_sdl.cpp +++ b/examples/common/entry/entry_sdl.cpp @@ -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 # endif @@ -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) { @@ -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) @@ -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; @@ -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) { diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index f66349694b..85df687873 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -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 @@ -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) diff --git a/include/bgfx/embedded_shader.h b/include/bgfx/embedded_shader.h index 6c8db4f80a..9b10f9794f 100644 --- a/include/bgfx/embedded_shader.h +++ b/include/bgfx/embedded_shader.h @@ -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 \ diff --git a/src/config.h b/src/config.h index 1014a06d2d..820a08b3a3 100644 --- a/src/config.h +++ b/src/config.h @@ -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) diff --git a/src/renderer_gl.h b/src/renderer_gl.h index d45769c299..a70be84967 100644 --- a/src/renderer_gl.h +++ b/src/renderer_gl.h @@ -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 \ @@ -23,7 +22,6 @@ ) ) #define BGFX_USE_GL_DYNAMIC_LIB (0 \ - || BX_PLATFORM_BSD \ || BX_PLATFORM_LINUX \ || BX_PLATFORM_WINDOWS \ ) @@ -62,7 +60,7 @@ # if BGFX_CONFIG_RENDERER_OPENGL >= 31 # include # else -# if BX_PLATFORM_LINUX || BX_PLATFORM_BSD +# if BX_PLATFORM_LINUX # define GL_PROTOTYPES # define GL_GLEXT_LEGACY # include