From 74b82bab3b6e4e8a1799bbcbdc5244f20f4d2826 Mon Sep 17 00:00:00 2001 From: Stenzek Date: Wed, 3 Oct 2018 22:28:38 +1000 Subject: [PATCH] GLInterface: Drop Haiku support --- CMakeLists.txt | 15 +--- Source/Core/Common/CMakeLists.txt | 6 -- Source/Core/Common/GL/GLInterface/BGL.cpp | 70 ------------------- Source/Core/Common/GL/GLInterface/BGL.h | 27 ------- .../Core/Common/GL/GLInterface/EGLHaiku.cpp | 30 -------- Source/Core/Common/GL/GLInterface/EGLHaiku.h | 16 ----- .../Common/GL/GLInterface/GLInterface.cpp | 5 -- Source/Core/VideoCommon/DriverDetails.cpp | 2 - Source/Core/VideoCommon/DriverDetails.h | 1 - 9 files changed, 3 insertions(+), 169 deletions(-) delete mode 100644 Source/Core/Common/GL/GLInterface/BGL.cpp delete mode 100644 Source/Core/Common/GL/GLInterface/BGL.h delete mode 100644 Source/Core/Common/GL/GLInterface/EGLHaiku.cpp delete mode 100644 Source/Core/Common/GL/GLInterface/EGLHaiku.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 1466e27810..3b336a88cb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -87,13 +87,8 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON) # Set up paths set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") -if(HAIKU) - set(datadir ${CMAKE_INSTALL_PREFIX}/data/dolphin-emu CACHE PATH "datadir") - set(mandir ${CMAKE_INSTALL_PREFIX}/documentation/man CACHE PATH "mandir") -else() - set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") - set(mandir ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "mandir") -endif() +set(datadir ${CMAKE_INSTALL_PREFIX}/share/dolphin-emu CACHE PATH "datadir") +set(mandir ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "mandir") add_definitions(-DDATA_DIR="${datadir}/") if(CMAKE_SYSROOT) @@ -381,10 +376,6 @@ if(ANDROID) SET(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) SET(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM NEVER) SET(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) -elseif(HAIKU) - set(USE_X11 0) - set(USE_UPNP 0) - set(USE_EGL 0) endif() if(ENABLE_HEADLESS) @@ -427,7 +418,7 @@ endif() set(USE_X11 0) -if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT HAIKU AND NOT ENABLE_HEADLESS) +if(UNIX AND NOT APPLE AND NOT ANDROID AND NOT ENABLE_HEADLESS) find_package(X11) if(TRY_X11 AND X11_FOUND) set(USE_X11 1) diff --git a/Source/Core/Common/CMakeLists.txt b/Source/Core/Common/CMakeLists.txt index 507e08662e..d0ac4a48cd 100644 --- a/Source/Core/Common/CMakeLists.txt +++ b/Source/Core/Common/CMakeLists.txt @@ -130,9 +130,6 @@ if(WIN32) ) elseif(APPLE) target_sources(common PRIVATE GL/GLInterface/AGL.mm) -elseif(HAIKU) - target_sources(common PRIVATE GL/GLInterface/BGL.cpp) - target_link_libraries(common PUBLIC be GL) elseif(USE_X11) if (NOT USE_EGL) target_sources(common PRIVATE GL/GLInterface/GLX.cpp) @@ -163,9 +160,6 @@ if(UNIX) if(SYSTEMD_FOUND) target_link_libraries(traversal_server PRIVATE ${SYSTEMD_LIBRARIES}) endif() - if(HAIKU) - target_link_libraries(traversal_server PRIVATE network) - endif() elseif(WIN32) target_link_libraries(common PRIVATE "-INCLUDE:enableCompatPatches") endif() diff --git a/Source/Core/Common/GL/GLInterface/BGL.cpp b/Source/Core/Common/GL/GLInterface/BGL.cpp deleted file mode 100644 index ed2670efc5..0000000000 --- a/Source/Core/Common/GL/GLInterface/BGL.cpp +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include "Common/GL/GLInterface/BGL.h" - -#include -#include -#include - -void cInterfaceBGL::Swap() -{ - m_gl->SwapBuffers(); -} - -bool cInterfaceBGL::Create(void* window_handle, bool stereo, bool core) -{ - m_window = static_cast(window_handle); - - m_gl = new BGLView(m_window->Bounds(), "cInterfaceBGL", B_FOLLOW_ALL_SIDES, 0, - BGL_RGB | BGL_DOUBLE | BGL_ALPHA); - m_window->AddChild(m_gl); - - s_opengl_mode = GLInterfaceMode::MODE_OPENGL; - - // Control m_window size and picture scaling - BRect size = m_gl->Frame(); - s_backbuffer_width = size.IntegerWidth(); - s_backbuffer_height = size.IntegerHeight(); - - return true; -} - -bool cInterfaceBGL::MakeCurrent() -{ - m_gl->LockGL(); - return true; -} - -bool cInterfaceBGL::ClearCurrent() -{ - m_gl->UnlockGL(); - return true; -} - -void cInterfaceBGL::Shutdown() -{ - // We don't need to delete m_gl, it's owned by the BWindow. - m_gl = nullptr; -} - -void cInterfaceBGL::Update() -{ - BRect size = m_gl->Frame(); - - if (s_backbuffer_width == size.IntegerWidth() && s_backbuffer_height == size.IntegerHeight()) - return; - - s_backbuffer_width = size.IntegerWidth(); - s_backbuffer_height = size.IntegerHeight(); -} - -void cInterfaceBGL::SwapInterval(int interval) -{ -} - -void* cInterfaceBGL::GetFuncAddress(const std::string& name) -{ - return m_gl->GetGLProcAddress(name.c_str()); -} diff --git a/Source/Core/Common/GL/GLInterface/BGL.h b/Source/Core/Common/GL/GLInterface/BGL.h deleted file mode 100644 index b26e5e3fc8..0000000000 --- a/Source/Core/Common/GL/GLInterface/BGL.h +++ /dev/null @@ -1,27 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "Common/GL/GLInterfaceBase.h" - -class BWindow; -class BGLView; - -class cInterfaceBGL final : public cInterfaceBase -{ -public: - void Swap() override; - void* GetFuncAddress(const std::string& name) override; - bool Create(void* window_handle, bool stereo, bool core) override; - bool MakeCurrent() override; - bool ClearCurrent() override; - void Shutdown() override; - void Update() override; - void SwapInterval(int interval) override; - -private: - BWindow* m_window; - BGLView* m_gl; -}; diff --git a/Source/Core/Common/GL/GLInterface/EGLHaiku.cpp b/Source/Core/Common/GL/GLInterface/EGLHaiku.cpp deleted file mode 100644 index 253b9c8c98..0000000000 --- a/Source/Core/Common/GL/GLInterface/EGLHaiku.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#include "Common/GL/GLInterface/EGLHaiku.h" - -#include - -EGLDisplay cInterfaceEGLHaiku::OpenDisplay() -{ - return eglGetDisplay(EGL_DEFAULT_DISPLAY); -} - -EGLNativeWindowType cInterfaceEGLHaiku::InitializePlatform(EGLNativeWindowType host_window, - EGLConfig config) -{ - EGLint format; - eglGetConfigAttrib(egl_dpy, config, EGL_NATIVE_VISUAL_ID, &format); - - BWindow* window = reinterpret_cast(host_window); - const int width = window->Size().width; - const int height = window->Size().height; - GLInterface->SetBackBufferDimensions(width, height); - - return host_window; -} - -void cInterfaceEGLHaiku::ShutdownPlatform() -{ -} diff --git a/Source/Core/Common/GL/GLInterface/EGLHaiku.h b/Source/Core/Common/GL/GLInterface/EGLHaiku.h deleted file mode 100644 index fc755963df..0000000000 --- a/Source/Core/Common/GL/GLInterface/EGLHaiku.h +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright 2017 Dolphin Emulator Project -// Licensed under GPLv2+ -// Refer to the license.txt file included. - -#pragma once - -#include "Common/GL/GLInterface/EGL.h" - -class cInterfaceEGLHaiku final : public cInterfaceEGL -{ -protected: - EGLDisplay OpenDisplay() override; - EGLNativeWindowType InitializePlatform(EGLNativeWindowType host_window, - EGLConfig config) override; - void ShutdownPlatform() override; -}; diff --git a/Source/Core/Common/GL/GLInterface/GLInterface.cpp b/Source/Core/Common/GL/GLInterface/GLInterface.cpp index edd84cc2ab..a6ae0c0991 100644 --- a/Source/Core/Common/GL/GLInterface/GLInterface.cpp +++ b/Source/Core/Common/GL/GLInterface/GLInterface.cpp @@ -20,9 +20,6 @@ #include "Common/GL/GLInterface/EGL.h" #elif ANDROID #include "Common/GL/GLInterface/EGLAndroid.h" -#elif defined(__HAIKU__) -#include "Common/GL/GLInterface/BGL.h" -#else #error Platform doesnt have a GLInterface #endif @@ -42,8 +39,6 @@ std::unique_ptr HostGL_CreateGLInterface() #endif #elif ANDROID return std::make_unique(); -#elif defined(__HAIKU__) - return std::make_unique(); #else return nullptr; #endif diff --git a/Source/Core/VideoCommon/DriverDetails.cpp b/Source/Core/VideoCommon/DriverDetails.cpp index 301c73d89f..fd52d3dd6b 100644 --- a/Source/Core/VideoCommon/DriverDetails.cpp +++ b/Source/Core/VideoCommon/DriverDetails.cpp @@ -35,8 +35,6 @@ const u32 m_os = OS_ALL | OS_LINUX; const u32 m_os = OS_ALL | OS_FREEBSD; #elif __OpenBSD__ const u32 m_os = OS_ALL | OS_OPENBSD; -#elif __HAIKU__ -const u32 m_os = OS_ALL | OS_HAIKU; #endif static API m_api = API_OPENGL; diff --git a/Source/Core/VideoCommon/DriverDetails.h b/Source/Core/VideoCommon/DriverDetails.h index 9ace5f83b4..7d60b0e168 100644 --- a/Source/Core/VideoCommon/DriverDetails.h +++ b/Source/Core/VideoCommon/DriverDetails.h @@ -27,7 +27,6 @@ enum OS OS_ANDROID = (1 << 4), OS_FREEBSD = (1 << 5), OS_OPENBSD = (1 << 6), - OS_HAIKU = (1 << 7), }; // Enum of known vendors // Tegra and Nvidia are separated out due to such substantial differences