Merge branch 'gl-context-refactor'

Author: stenzek

CMakeLists.txt

@@ -4,6 +4,14 @@ project(duckstation C CXX)
 # Pull in modules.
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/CMakeModules/")
 
+# Platform detection.
+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
+  set(LINUX TRUE)
+  set(SUPPORTS_X11 TRUE)
+endif()
+
+
+# Global options.
 if(NOT ANDROID)
   option(BUILD_SDL_FRONTEND "Build the SDL frontend" ON)
   option(BUILD_QT_FRONTEND "Build the Qt frontend" ON)
@@ -12,6 +20,15 @@ if(NOT ANDROID)
 endif()
 
 
+# OpenGL context creation methods.
+if(SUPPORTS_X11)
+  option(USE_X11 "Support X11 window system" ON)
+endif()
+if(LINUX OR ANDROID)
+  option(USE_EGL "Support EGL OpenGL context creation" ON)
+endif()
+
+
 # Common include/library directories on Windows.
 if(WIN32)
   set(SDL2_FOUND TRUE)
@@ -40,12 +57,12 @@ if(NOT ANDROID)
   endif()
 endif()
 
-if(ANDROID)
+if(USE_EGL)
   find_package(EGL REQUIRED)
-else()
-  find_package(OpenGL COMPONENTS EGL GLX OpenGL)
 endif()
-
+if(USE_X11)
+  find_package(X11 REQUIRED)
+endif()
 
 # Set _DEBUG macro for Debug builds.
 set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG")

dep/glad/CMakeLists.txt

@@ -2,7 +2,25 @@ set(SRCS
     src/glad.c
 )
 
-add_library(glad ${SRCS})
+# Linking as a static library breaks on macOS, see https://github.com/libigl/libigl/issues/751
+if(APPLE)
+  add_library(glad OBJECT ${SRCS})
+else()
+  add_library(glad ${SRCS})
+endif()
+
 target_include_directories(glad PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/include")
 target_include_directories(glad INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/include")
-target_link_libraries(glad Threads::Threads "${CMAKE_DL_LIBS}")
+target_link_libraries(glad PRIVATE Threads::Threads "${CMAKE_DL_LIBS}")
+
+if(WIN32)
+  target_sources(glad PRIVATE src/glad_wgl.c)
+else()
+  if(USE_EGL)
+    target_sources(glad PRIVATE src/glad_egl.c)
+    target_link_libraries(glad PRIVATE EGL::EGL)
+  endif()
+  if(SUPPORTS_X11)
+    target_sources(glad PRIVATE src/glad_glx.c)
+  endif()
+endif()

dep/glad/glad.vcxproj

@@ -36,9 +36,11 @@
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\glad.c" />
+    <ClCompile Include="src\glad_wgl.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\glad.h" />
+    <ClInclude Include="include\glad_wgl.h" />
     <ClInclude Include="include\khrplatform.h" />
   </ItemGroup>
   <PropertyGroup Label="Globals">

dep/glad/glad.vcxproj.filters

@@ -2,9 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <ClCompile Include="src\glad.c" />
+    <ClCompile Include="src\glad_wgl.c" />
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="include\khrplatform.h" />
     <ClInclude Include="include\glad.h" />
+    <ClInclude Include="include\glad_wgl.h" />
   </ItemGroup>
 </Project>