Skip to content

Commit 3cd7c6c

Browse files
CarterLiCarterLi
committed
OpenGL: drop OSMesa backend
Fix #1618
1 parent 3227e93 commit 3cd7c6c

File tree

10 files changed

+15
-104
lines changed

10 files changed

+15
-104
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
run: uname -a
3636

3737
- name: configure project
38-
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OSMESA=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
38+
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr . -DENABLE_VULKAN=OFF -DENABLE_WAYLAND=OFF -DENABLE_XCB_RANDR=OFF -DENABLE_XCB=OFF -DENABLE_XRANDR=OFF -DENABLE_X11=OFF -DENABLE_DRM=OFF -DENABLE_DRM_AMDGPU=OFF -DENABLE_GIO=OFF -DENABLE_DCONF=OFF -DENABLE_DBUS=OFF -DENABLE_XFCONF=OFF -DENABLE_SQLITE3=OFF -DENABLE_RPM=OFF -DENABLE_IMAGEMAGICK7=OFF -DENABLE_IMAGEMAGICK6=OFF -DENABLE_CHAFA=OFF -DENABLE_ZLIB=OFF -DENABLE_EGL=OFF -DENABLE_GLX=OFF -DENABLE_OPENCL=OFF -DENABLE_FREETYPE=OFF -DENABLE_PULSE=OFF -DENABLE_DDCUTIL=OFF -DENABLE_ELF=OFF -DENABLE_DIRECTX_HEADERS=OFF -DENABLE_THREADS=OFF
3939

4040
- name: build project
4141
run: cmake --build . --target package --verbose -j4
@@ -80,7 +80,7 @@ jobs:
8080
run: cat /proc/cpuinfo
8181

8282
- name: install required packages
83-
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
83+
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev
8484

8585
- name: install linuxbrew packages
8686
run: |
@@ -149,7 +149,7 @@ jobs:
149149
run: cat /proc/cpuinfo
150150

151151
- name: install required packages
152-
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev libchafa-dev libddcutil-dev rpm
152+
run: sudo apt-get update && sudo apt-get install -y libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev libchafa-dev libddcutil-dev rpm
153153

154154
- name: configure project
155155
run: cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On -DCMAKE_INSTALL_PREFIX=/usr .
@@ -208,7 +208,7 @@ jobs:
208208
# CMake installed by apt has bug `list sub-command REMOVE_ITEM requires two or more arguments`
209209
wget --no-check-certificate https://apt.kitware.com/ubuntu/pool/main/c/cmake/{cmake_3.29.2-0kitware1ubuntu20.04.1_armhf.deb,cmake-data_3.29.2-0kitware1ubuntu20.04.1_all.deb}
210210
dpkg -i *.deb
211-
apt-get install -y make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
211+
apt-get install -y make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
212212
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
213213
cmake --build . --target package --verbose -j4
214214
./fastfetch --list-features
@@ -244,7 +244,7 @@ jobs:
244244
run: |
245245
uname -a
246246
apt-get update && apt-get install -y wget
247-
apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
247+
apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libelf-dev directx-headers-dev rpm
248248
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
249249
cmake --build . --target package --verbose -j4
250250
./fastfetch --list-features
@@ -279,7 +279,7 @@ jobs:
279279
githubToken: ${{ github.token }}
280280
run: |
281281
uname -a
282-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-dev directx-headers-dev rpm
282+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libddcutil-dev libchafa-dev libelf-dev directx-headers-dev rpm
283283
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
284284
cmake --build . --target package --verbose -j4
285285
./fastfetch --list-features
@@ -314,7 +314,7 @@ jobs:
314314
githubToken: ${{ github.token }}
315315
run: |
316316
uname -a
317-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
317+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
318318
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
319319
cmake --build . --target package --verbose -j4
320320
./fastfetch --list-features
@@ -349,7 +349,7 @@ jobs:
349349
githubToken: ${{ github.token }}
350350
run: |
351351
uname -a
352-
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev libosmesa6-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
352+
apt-get update && apt-get install -y cmake make g++ libvulkan-dev libwayland-dev libxrandr-dev libxcb-randr0-dev libdconf-dev libdbus-1-dev libmagickcore-dev libxfconf-0-dev libsqlite3-dev librpm-dev libegl-dev libglx-dev ocl-icd-opencl-dev libpulse-dev libdrm-dev libchafa-dev libelf-dev directx-headers-dev rpm
353353
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DCMAKE_INSTALL_PREFIX=/usr .
354354
cmake --build . --target package --verbose -j4
355355
./fastfetch --list-features
@@ -504,7 +504,7 @@ jobs:
504504
run: |
505505
uname -a
506506
sudo pkg update
507-
sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat chafa
507+
sudo pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl opencl ocl-icd v4l_compat chafa
508508
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .
509509
cmake --build . --target package --verbose -j4
510510
./fastfetch --list-features
@@ -537,7 +537,7 @@ jobs:
537537
prepare: |
538538
uname -a
539539
pkg update
540-
pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl libosmesa opencl ocl-icd v4l_compat chafa libelf
540+
pkg install -y cmake git pkgconf binutils wayland vulkan-headers vulkan-loader libxcb libXrandr libX11 libdrm glib dconf dbus sqlite3-tcl xfce4-conf egl opencl ocl-icd v4l_compat chafa libelf
541541
542542
run: |
543543
cmake -DSET_TWEAK=Off -DBUILD_TESTS=On -DENABLE_EMBEDDED_PCIIDS=On -DENABLE_EMBEDDED_AMDGPUIDS=On .

‎CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ cmake_dependent_option(ENABLE_CHAFA "Enable chafa" ON "ENABLE_IMAGEMAGICK6 OR EN
7474
cmake_dependent_option(ENABLE_ZLIB "Enable zlib" ON "ENABLE_IMAGEMAGICK6 OR ENABLE_IMAGEMAGICK7" OFF)
7575
cmake_dependent_option(ENABLE_EGL "Enable egl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR ANDROID OR WIN32 OR SunOS OR Haiku" OFF)
7676
cmake_dependent_option(ENABLE_GLX "Enable glx" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR ANDROID OR SunOS" OFF)
77-
cmake_dependent_option(ENABLE_OSMESA "Enable osmesa" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR SunOS OR Haiku" OFF)
7877
cmake_dependent_option(ENABLE_OPENCL "Enable opencl" ON "LINUX OR FreeBSD OR OpenBSD OR NetBSD OR WIN32 OR ANDROID OR SunOS OR Haiku" OFF)
7978
cmake_dependent_option(ENABLE_FREETYPE "Enable freetype" ON "ANDROID" OFF)
8079
cmake_dependent_option(ENABLE_PULSE "Enable pulse" ON "LINUX OR SunOS" OFF)
@@ -1478,10 +1477,6 @@ else()
14781477
"GL"
14791478
)
14801479
endif()
1481-
ff_lib_enable(OSMESA
1482-
"osmesa"
1483-
"OSMesa"
1484-
)
14851480
ff_lib_enable(OPENCL
14861481
"OpenCL"
14871482
"OpenCL"

‎completions/fastfetch.bash‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,6 @@ __fastfetch_complete_gl()
9797
"auto"
9898
"egl"
9999
"glx"
100-
"osmesa"
101100
)
102101
COMPREPLY=($(compgen -W "${__ff_gl_types[*]}" -- "$CURRENT_WORD"))
103102
}

‎debian/control‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Source: fastfetch
22
Section: universe/utils
33
Priority: optional
44
Maintainer: Carter Li <[email protected]>
5-
Build-Depends: libvulkan-dev, libwayland-dev, libxrandr-dev, libxcb-randr0-dev, libdconf-dev, libdbus-1-dev, libmagickcore-dev, libxfconf-0-dev, libsqlite3-dev, librpm-dev, libegl-dev, libglx-dev, libosmesa6-dev, ocl-icd-opencl-dev, libpulse-dev, libdrm-dev, libddcutil-dev, libchafa-dev, directx-headers-dev, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build
5+
Build-Depends: libvulkan-dev, libwayland-dev, libxrandr-dev, libxcb-randr0-dev, libdconf-dev, libdbus-1-dev, libmagickcore-dev, libxfconf-0-dev, libsqlite3-dev, librpm-dev, libegl-dev, libglx-dev, ocl-icd-opencl-dev, libpulse-dev, libdrm-dev, libddcutil-dev, libchafa-dev, directx-headers-dev, pkgconf, cmake (>= 3.12), debhelper (>= 11.2), dh-cmake, dh-cmake-compat (= 1), dh-sequence-cmake, dh-sequence-ctest, ninja-build
66
Standards-Version: 4.0.0
77
Homepage: https://github.com/fastfetch-cli/fastfetch
88

‎doc/json_schema.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2563,8 +2563,7 @@
25632563
"enum": [
25642564
"auto",
25652565
"egl",
2566-
"glx",
2567-
"osmesa"
2566+
"glx"
25682567
],
25692568
"default": "auto"
25702569
},

‎src/common/init.c‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ void ffListFeatures(void)
227227
#if FF_HAVE_GLX
228228
"glx\n"
229229
#endif
230-
#if FF_HAVE_OSMESA
231-
"osmesa\n"
232-
#endif
233230
#if FF_HAVE_OPENCL
234231
"opencl\n"
235232
#endif

‎src/data/help.json‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1419,10 +1419,9 @@
14191419
"arg": {
14201420
"type": "enum",
14211421
"enum": {
1422-
"auto": "Auto detection",
1422+
"auto": "Prefer EGL on *nix; prefer platform specific implementation on others",
14231423
"egl": "EGL",
1424-
"glx": "GLX",
1425-
"osmesa": "OSMesa"
1424+
"glx": "GLX (*nix only)"
14261425
},
14271426
"default": "auto"
14281427
}

‎src/detection/opengl/opengl_linux.c‎

Lines changed: 1 addition & 73 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
#endif
1212
#endif
1313

14-
#if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX) || defined(FF_HAVE_OSMESA)
14+
#if defined(FF_HAVE_EGL) || defined(FF_HAVE_GLX)
1515
#define FF_HAVE_GL 1
1616

1717
#include "common/library.h"
@@ -155,66 +155,6 @@ static const char* detectByGlx(FFOpenGLResult* result)
155155

156156
#endif //FF_HAVE_GLX
157157

158-
#ifdef FF_HAVE_OSMESA
159-
#if __has_include(<GL/osmesa.h>)
160-
#include <GL/osmesa.h>
161-
#else
162-
#include <mesa/osmesa.h> // for sunos
163-
#endif
164-
165-
typedef struct OSMesaData
166-
{
167-
FF_LIBRARY_SYMBOL(glGetString)
168-
FF_LIBRARY_SYMBOL(OSMesaGetProcAddress)
169-
FF_LIBRARY_SYMBOL(OSMesaCreateContext)
170-
FF_LIBRARY_SYMBOL(OSMesaMakeCurrent)
171-
FF_LIBRARY_SYMBOL(OSMesaDestroyContext)
172-
173-
OSMesaContext context;
174-
} OSMesaData;
175-
176-
static const char* osMesaHandleContext(FFOpenGLResult* result, OSMesaData* data)
177-
{
178-
unsigned char buffer[FF_OPENGL_BUFFER_WIDTH * FF_OPENGL_BUFFER_HEIGHT * sizeof(uint32_t)]; // 4 bytes per pixel (RGBA)
179-
180-
if(data->ffOSMesaMakeCurrent(data->context, buffer, GL_UNSIGNED_BYTE, FF_OPENGL_BUFFER_WIDTH, FF_OPENGL_BUFFER_HEIGHT) != GL_TRUE)
181-
return "OSMesaMakeCurrent returned GL_FALSE";
182-
183-
ffOpenGLHandleResult(result, data->ffglGetString);
184-
ffStrbufSetF(&result->library, "OSMesa %d.%d.%d", OSMESA_MAJOR_VERSION, OSMESA_MINOR_VERSION, OSMESA_PATCH_VERSION);
185-
return NULL;
186-
}
187-
188-
static const char* osMesaHandleData(FFOpenGLResult* result, OSMesaData* data)
189-
{
190-
data->ffglGetString = (void*) data->ffOSMesaGetProcAddress("glGetString");
191-
if(data->ffglGetString == NULL)
192-
return "OSMesaGetProcAddress(glGetString) returned NULL";
193-
194-
data->context = data->ffOSMesaCreateContext(OSMESA_RGBA, NULL);
195-
if(data->context == NULL)
196-
return "OSMesaCreateContext returned NULL";
197-
198-
const char* error = osMesaHandleContext(result, data);
199-
data->ffOSMesaDestroyContext(data->context);
200-
return error;
201-
}
202-
203-
static const char* detectByOsMesa(FFOpenGLResult* result)
204-
{
205-
OSMesaData data;
206-
207-
FF_LIBRARY_LOAD(osmesa, "dlopen osmesa failed", "libOSMesa" FF_LIBRARY_EXTENSION, 8);
208-
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaGetProcAddress);
209-
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaCreateContext);
210-
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaMakeCurrent);
211-
FF_LIBRARY_LOAD_SYMBOL_VAR_MESSAGE(osmesa, data, OSMesaDestroyContext);
212-
213-
return osMesaHandleData(result, &data);
214-
}
215-
216-
#endif //FF_HAVE_OSMESA
217-
218158
const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result)
219159
{
220160
#if FF_HAVE_GL
@@ -238,15 +178,6 @@ const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result)
238178
#endif
239179
}
240180

241-
if(options->library == FF_OPENGL_LIBRARY_OSMESA)
242-
{
243-
#ifdef FF_HAVE_OSMESA
244-
return detectByOsMesa(result);
245-
#else
246-
return "fastfetch was compiled without osmesa support";
247-
#endif
248-
}
249-
250181
const char* error = ""; // not NULL dummy value
251182

252183
#ifdef FF_HAVE_EGL
@@ -259,9 +190,6 @@ const char* ffDetectOpenGL(FFOpenGLOptions* options, FFOpenGLResult* result)
259190
error = detectByGlx(result);
260191
#endif
261192

262-
//We don't use osmesa in auto mode here, because it is a software implementation,
263-
//that doesn't reflect the opengl supported by the hardware
264-
265193
return error;
266194

267195
#else

‎src/modules/opengl/opengl.c‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ bool ffParseOpenGLCommandOptions(FFOpenGLOptions* options, const char* key, cons
5656
{ "auto", FF_OPENGL_LIBRARY_AUTO },
5757
{ "egl", FF_OPENGL_LIBRARY_EGL },
5858
{ "glx", FF_OPENGL_LIBRARY_GLX },
59-
{ "osmesa", FF_OPENGL_LIBRARY_OSMESA },
6059
{}
6160
});
6261
return true;
@@ -85,7 +84,6 @@ void ffParseOpenGLJsonObject(FFOpenGLOptions* options, yyjson_val* module)
8584
{ "auto", FF_OPENGL_LIBRARY_AUTO },
8685
{ "egl", FF_OPENGL_LIBRARY_EGL },
8786
{ "glx", FF_OPENGL_LIBRARY_GLX },
88-
{ "osmesa", FF_OPENGL_LIBRARY_OSMESA },
8987
{},
9088
});
9189
if (error)
@@ -119,9 +117,6 @@ void ffGenerateOpenGLJsonConfig(FFOpenGLOptions* options, yyjson_mut_doc* doc, y
119117
case FF_OPENGL_LIBRARY_GLX:
120118
yyjson_mut_obj_add_str(doc, module, "library", "glx");
121119
break;
122-
case FF_OPENGL_LIBRARY_OSMESA:
123-
yyjson_mut_obj_add_str(doc, module, "library", "osmesa");
124-
break;
125120
}
126121
}
127122
}

‎src/modules/opengl/option.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ typedef enum __attribute__((__packed__)) FFOpenGLLibrary
99
FF_OPENGL_LIBRARY_AUTO,
1010
FF_OPENGL_LIBRARY_EGL,
1111
FF_OPENGL_LIBRARY_GLX,
12-
FF_OPENGL_LIBRARY_OSMESA
1312
} FFOpenGLLibrary;
1413

1514
typedef struct FFOpenGLOptions

0 commit comments

Comments
 (0)