Finish OpenGL module

Author: LinusDierheimer

.github/workflows/pull_request.yml

@@ -13,7 +13,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libgl-dev libegl-dev libglx-dev
+        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

.github/workflows/push.yml

@@ -16,7 +16,7 @@ jobs:
         uses: actions/checkout@v2
 
       - name: install required packages
-        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libgl-dev libegl-dev libglx-dev
+        run: sudo apt-get update && sudo apt-get install -y libpci-dev libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev rpm librpm-dev libzstd-dev libegl-dev libglx-dev libosmesa6-dev
 
       - name: Initialize CodeQL
         uses: github/codeql-action/init@v1

CMakeLists.txt

@@ -33,9 +33,9 @@ OPTION(ENABLE_IMAGEMAGICK7 "Enable imagemagick 7" ON)
 OPTION(ENABLE_IMAGEMAGICK6 "Enable imagemagick 6" ON)
 OPTION(ENABLE_ZLIB "Enable zlib" ON)
 OPTION(ENABLE_CHAFA "Enable chafa" ON)
-OPTION(ENABLE_GL "Enable gl" ON)
 OPTION(ENABLE_EGL "Enable egl" ON)
 OPTION(ENABLE_GLX "Enable glx" ON)
+OPTION(ENABLE_OSMESA "Enable osmesa" ON)
 
 if(NOT CMAKE_BUILD_TYPE)
     set(CMAKE_BUILD_TYPE Release)
@@ -351,44 +351,30 @@ if(ENABLE_CHAFA)
     endif()
 endif()
 
-if(ENABLE_GL)
-    pkg_check_modules(GL gl)
-    if(NOT GL_FOUND)
-        message(WARNING "Package gl not found. Building without support.")
-    endif()
-endif()
-
 if(ENABLE_EGL)
-    if(GL_FOUND)
-        pkg_check_modules(EGL egl)
-        if(EGL_FOUND)
-            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_EGL=1)
-        else()
-            message(WARNING "Package egl not found. Building without support.")
-        endif()
+    pkg_check_modules(EGL egl)
+    if(EGL_FOUND)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_EGL=1)
     else()
-        message(WARNING "egl not enabled, because gl was not enabled or found. Building without support.")
+        message(WARNING "Package egl not found. Building without support.")
     endif()
 endif()
 
 if(ENABLE_GLX)
-    if(GL_FOUND)
-        pkg_check_modules(GLX glx)
-        if(GLX_FOUND)
-            target_compile_definitions(libfastfetch PRIVATE FF_HAVE_GLX=1)
-        else()
-            message(WARNING "Package glx not found. Building without support.")
-        endif()
+    pkg_check_modules(GLX glx)
+    if(GLX_FOUND)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_GLX=1)
     else()
-        message(WARNING "glx not enabled, because gl was not enabled or found. Building without support")
+        message(WARNING "Package glx not found. Building without support.")
     endif()
 endif()
 
-if(GL_FOUND)
-    if(EGL_FOUND OR GLX_FOUND)
-        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_GL=1)
+if(ENABLE_OSMESA)
+    pkg_check_modules(OSMESA osmesa)
+    if(OSMESA_FOUND)
+        target_compile_definitions(libfastfetch PRIVATE FF_HAVE_OSMESA=1)
     else()
-        message(WARNING "gl not enabled, because neither egl nor glx were found. Building without support.")
+        message(WARNING "Package osmesa not found. Building without support.")
     endif()
 endif()
 
@@ -414,9 +400,9 @@ target_include_directories(libfastfetch
     PRIVATE ${ZLIB_INCLUDE_DIRS}
     PRIVATE ${CHAFA_INCLUDE_DIRS}
     PRIVATE ${VULKAN_INCLUDE_DIRS}
-    PRIVATE ${GL_INCLUDE_DIRS}
     PRIVATE ${EGL_INCLUDE_DIRS}
     PRIVATE ${GLX_INCLUDE_DIRS}
+    PRIVATE ${OSMESA_INCLUDE_DIRS}
 )
 
 target_link_libraries(libfastfetch

DEVELOPMENT.md

@@ -14,7 +14,6 @@ Here i just add things that are easy to forget.
 - [ ] Better OS output for all possible combinations of /etc/os-release variables.
 - [ ] Expose temperatures to CPU format string
 - [ ] Expose temperatures to GPU format string
-- [ ] Fallback GPU detection using GL (multi GPU suport somehow possible?)
 - [ ] Find wayland compositor by looking at \${XDG_RUNTIME_DIR}/${WAYLAND_DISPLAY:-wayland-0}
 - [ ] Make LocalIP module more configurable
 - [ ] Automatic migrate old config files to newer versions

README.md

@@ -22,19 +22,19 @@ The following libraries are used if present at runtime:
 *  [`libpci`](https://github.com/pciutils/pciutils): GPU output.
 *  [`libvulkan`](https://www.vulkan.org/): Vulkan module & fallback for GPU output.
 *  [`libxcb-randr`](https://xcb.freedesktop.org/),
-   [`libXrandr`](https://gitlab.freedesktop.org/xorg/lib/libxrandr),
-   [`libxcb`](https://xcb.freedesktop.org/),
-   [`libX11`](https://gitlab.freedesktop.org/xorg/lib/libx11): At least one of them sould be present in X11 sessions for better resolution detection and faster WM detection. The `*randr` ones provide multi monitor support. The `libxcb*` ones usually have better performance.
+    [`libXrandr`](https://gitlab.freedesktop.org/xorg/lib/libxrandr),
+    [`libxcb`](https://xcb.freedesktop.org/),
+    [`libX11`](https://gitlab.freedesktop.org/xorg/lib/libx11): At least one of them sould be present in X11 sessions for better resolution detection and faster WM detection. The `*randr` ones provide multi monitor support. The `libxcb*` ones usually have better performance.
 *  [`libwayland-client`](https://wayland.freedesktop.org/): Better resolution performance and output in wayland sessions. Supports different refresh rates per monitor.
 *  [`libGIO`](https://developer.gnome.org/gio/unstable/): Needed for values that are only stored GSettings.
 *  [`libDConf`](https://developer.gnome.org/dconf/unstable/): Needed for values that are only stored in DConf + Fallback for GSettings.
 *  [`libmagickcore` (ImageMagick)](https://www.imagemagick.org/): Images in terminal using sixel or kitty graphics protocol.
 *  [`libchafa`](https://github.com/hpjansson/chafa): Image output as ascii art.
 *  [`libZ`](https://www.zlib.net/): Faster image output when using kitty graphics protocol.
 *  [`libDBus`](https://www.freedesktop.org/wiki/Software/dbus): Needed for detecting current media player and song.
-*  [`libGL`](https://dri.freedesktop.org/wiki/libGL/):OpenGL module. At least one context creation library must be present too.
-*  [`libEGL`](https://www.khronos.org/registry/EGL/): OpenGL module, using EGL context.
-*  [`libGLX`](https://dri.freedesktop.org/wiki/GLX/): OpenGL module, using GLX context.
+*  [`libEGL`](https://www.khronos.org/registry/EGL/),
+    [`libGLX`](https://dri.freedesktop.org/wiki/GLX/),
+    [`libOSMesa`](https://docs.mesa3d.org/osmesa.html): At least one of them is needed by the OpenGL module for gl context creation.
 *  [`libXFConf`](https://gitlab.xfce.org/xfce/xfconf): Needed for XFWM theme and XFCE Terminal font.
 *  [`libsqlite3`](https://www.sqlite.org/index.html): Needed for rpm package count.
 *  [`librpm`](http://rpm.org/): Slower fallback for rpm package count. Needed on openSUSE.
@@ -44,7 +44,7 @@ All categories not listed here should work without needing a specific implementa
 
 ##### Available Modules
 ```
-Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, Player, Song, Vulkan, LocalIP, PublicIP, DateTime, Date, Time, Locale, Colors, Break, Custom
+Title, Separator, OS, Host, Kernel, Uptime, Processes, Packages, Shell, Resolution, DE, WM, WMTheme, Theme, Icons, Font, Cursor, Terminal, Terminal Font, CPU, CPUUsage, GPU, Memory, Disk, Battery, Player, Song, Vulkan, OpenGL, LocalIP, PublicIP, DateTime, Date, Time, Locale, Colors, Break, Custom
 ```
 
 ##### Logos

completions/bash

@@ -238,9 +238,9 @@ __fastfetch_completion()
         "--lib-imagemagick"
         "--lib-z"
         "--lib-chafa"
-        "--lib-gl"
         "--lib-egl"
         "--lib-glx"
+        "--lib-osmesa"
         "--battery-dir"
         "--load-config"
     )

src/common/init.c

@@ -210,9 +210,9 @@ static void defaultConfig(FFinstance* instance)
     ffStrbufInitA(&instance->config.libImageMagick, 0);
     ffStrbufInitA(&instance->config.libZ, 0);
     ffStrbufInitA(&instance->config.libChafa, 0);
-    ffStrbufInitA(&instance->config.libGL, 0);
     ffStrbufInitA(&instance->config.libEGL, 0);
     ffStrbufInitA(&instance->config.libGLX, 0);
+    ffStrbufInitA(&instance->config.libOSMesa, 0);
 
     ffStrbufInitA(&instance->config.diskFolders, 0);
 
@@ -344,15 +344,15 @@ void ffListFeatures()
         #ifdef FF_HAVE_RPM
             "rpm\n"
         #endif
-        #ifdef FF_HAVE_GL
-            "gl\n"
-        #endif
         #ifdef FF_HAVE_EGL
             "egl\n"
         #endif
         #ifdef FF_HAVE_GLX
             "glx\n"
         #endif
+        #ifdef FF_HAVE_OSMESA
+            "osmesa\n"
+        #endif
         ""
     , stdout);
 }

src/data/config.txt

@@ -254,6 +254,6 @@
 #--lib-imagemagick /usr/lib/libMagickCore-7.Q16HDRI.so
 #--lib-z /usr/lib/libz.so
 #--lib-chafa /usr/lib/libchafa.so
-#--lib-gl /usr/lib/libGL.so
 #--lib-egl /usr/lib/libEGL.so
-#--lib-GLX /usr/lib/libGLX.so
+#--lib-glx /usr/lib/libGLX.so
+#--lib-osmesa /usr/lib/libOSMesa.so

src/data/help.txt

@@ -132,9 +132,9 @@ Library options: Set the path of a library to load
     --lib-imagemagick <path>
     --lib-z <path>
     --lib-chafa <path>
-    --lib-gl <path>
     --lib-egl <path>
     --lib-glx <path>
+    --lib-osmesa <path>
 
 Module specific options:
     --separator-string <str>:     Set the string printed by the separator module

src/fastfetch.c

@@ -358,7 +358,8 @@ static inline void printCommandHelp(const char* command)
         constructAndPrintCommandHelpFormat("opengl", "{}", 3,
             "version",
             "renderer",
-            "vendor"
+            "vendor",
+            "shading language version"
         );
     }
     else
@@ -1029,12 +1030,12 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
         optionParseString(key, value, &instance->config.libZ);
     else if(strcasecmp(key, "--lib-chafa") == 0)
         optionParseString(key, value, &instance->config.libChafa);
-    else if(strcasecmp(key, "--lib-gl") == 0)
-        optionParseString(key, value, &instance->config.libGL);
     else if(strcasecmp(key, "--lib-egl") == 0)
         optionParseString(key, value, &instance->config.libEGL);
     else if(strcasecmp(key, "--lib-glx") == 0)
         optionParseString(key, value, &instance->config.libGLX);
+    else if(strcasecmp(key, "--lib-osmesa") == 0)
+        optionParseString(key, value, &instance->config.libOSMesa);
 
     //////////////////
     //Module options//
@@ -1072,6 +1073,8 @@ static void parseOption(FFinstance* instance, FFdata* data, const char* key, con
             instance->config.glType = FF_GL_TYPE_EGL;
         else if(strcasecmp(value, "glx") == 0)
             instance->config.glType = FF_GL_TYPE_GLX;
+        else if(strcasecmp(value, "osmesa") == 0)
+            instance->config.glType = FF_GL_TYPE_OSMESA;
         else
         {
             fprintf(stderr, "Error: unknown gl type: %s\n", value);