Skip to content

Commit 7c61c9f

Browse files
author
Link Mauve
committed
Remove OSMesa support
Mesa has now removed OSMesa from its codebase, see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33836 There is no reason to keep this any longer, especially since EGL can do the same and more.
1 parent ca27248 commit 7c61c9f

File tree

15 files changed

+8
-454
lines changed

15 files changed

+8
-454
lines changed

‎desmume/README.WIN

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ Select available 3d emulation:
107107

108108
0 = 3d disabled
109109
1 = internal desmume software rasterizer (default)
110-
2 = osmesa or gtkglext opengl (if available, depending on compilation options, see desmume --help)
110+
2 = gtkglext opengl (if available, depending on compilation options, see desmume --help)
111111

112112
[edit] --disable-sound [gtk]
113113

‎desmume/src/frontend/posix/codeblocks/desmume.cbp

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
<Add option="`pkg-config --libs gtk+-2.0`" />
2626
<Add library="/usr/lib/x86_64-linux-gnu/libGL.so" />
2727
<Add library="/usr/lib/x86_64-linux-gnu/libGLESv2.so" />
28-
<Add library="/usr/lib/x86_64-linux-gnu/libOSMesa.so" />
2928
<Add library="/usr/lib/x86_64-linux-gnu/libEGL.so" />
3029
</Linker>
3130
</Target>
@@ -72,7 +71,6 @@
7271
<Add option="`pkg-config --libs gtk+-3.0`" />
7372
<Add library="/usr/lib/x86_64-linux-gnu/libGL.so" />
7473
<Add library="/usr/lib/x86_64-linux-gnu/libGLESv2.so" />
75-
<Add library="/usr/lib/x86_64-linux-gnu/libOSMesa.so" />
7674
<Add library="/usr/lib/x86_64-linux-gnu/libEGL.so" />
7775
</Linker>
7876
<ExtraCommands>
@@ -2024,20 +2022,6 @@
20242022
<Option target="&lt;{~None~}&gt;" />
20252023
</Unit>
20262024
<Unit filename="../shared/mic_openal.cpp" />
2027-
<Unit filename="../shared/osmesa_3Demu.cpp">
2028-
<Option target="GTK2_x64_Debug" />
2029-
<Option target="GTK2_x64_Release" />
2030-
<Option target="GTK3_x64_Debug" />
2031-
<Option target="GTK3_x64_Release" />
2032-
</Unit>
2033-
<Unit filename="../shared/osmesa_3Demu.h">
2034-
<Option target="GTK2_x64_Debug" />
2035-
<Option target="GTK2_x64_Release" />
2036-
<Option target="GTK3_x64_Debug" />
2037-
<Option target="GTK3_x64_Release" />
2038-
<Option target="GTK3_AArch64_Debug" />
2039-
<Option target="GTK3_AArch64_Release" />
2040-
</Unit>
20412025
<Unit filename="../shared/sdl_3Demu.cpp">
20422026
<Option target="GTK2_x64_Debug" />
20432027
<Option target="GTK2_x64_Release" />

‎desmume/src/frontend/posix/configure.ac

Lines changed: 1 addition & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ AM_CONDITIONAL([ENABLE_OPENGL_ES], [test "${have_opengles}" = "yes"])
118118

119119
dnl - if --enable-glx is used, check for it
120120
AC_ARG_ENABLE([glx],
121-
[AC_HELP_STRING([--enable-glx], [Use a GLX context, overrides --enable-osmesa and --enable-egl])],
121+
[AC_HELP_STRING([--enable-glx], [Use a GLX context, overrides --enable-egl])],
122122
[glx=$enableval],
123123
[glx=no])
124124

@@ -143,40 +143,6 @@ if test "$have_glx" = "yes" ; then
143143
fi
144144
AM_CONDITIONAL([ENABLE_GLX], [test "${have_glx}" = "yes"])
145145

146-
dnl - if --enable-osmesa is used, check for it
147-
AC_ARG_ENABLE([osmesa],
148-
[AC_HELP_STRING([--enable-osmesa], [Use an OSMesa context, overrides --enable-egl])],
149-
[osmesa=$enableval],
150-
[osmesa=no])
151-
152-
if test "x$osmesa" = "xyes" ; then
153-
AC_CHECK_HEADERS([GL/osmesa.h], [have_osmesa=yes], [have_osmesa=no])
154-
if test "have_osmesa" = "no" ; then
155-
AC_MSG_WARN([Cannot use OSMesa -- headers not found.])
156-
else
157-
AC_MSG_WARN([OSMesa contexts are deprecated.])
158-
AC_CHECK_LIB(dl, main)
159-
AC_CHECK_LIB(GL, main)
160-
AC_CHECK_LIB(OSMesa, main)
161-
fi
162-
fi
163-
164-
if test "$have_osmesa" = "yes" ; then
165-
if test "$have_opengl" = "yes" ; then
166-
AC_DEFINE(ENABLE_OSMESA)
167-
OSMESA_LIBS="-lOSMesa"
168-
AC_SUBST(OSMESA_LIBS)
169-
else
170-
have_osmesa=no
171-
if test "$have_opengles" = "yes" ; then
172-
AC_MSG_WARN([OSMesa contexts are incompatible with OpenGL ES -- cancelling the use of OSMesa.])
173-
else
174-
AC_MSG_WARN([OSMesa contexts are only compatible with standard OpenGL -- cancelling the use of OSMesa.])
175-
fi
176-
fi
177-
fi
178-
AM_CONDITIONAL([ENABLE_OSMESA], [test "${have_osmesa}" = "yes"])
179-
180146
dnl - if --enable-egl is used, check for it
181147
AC_ARG_ENABLE([egl],
182148
[AC_HELP_STRING([--enable-egl], [Use an EGL context])],

‎desmume/src/frontend/posix/gtk/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ endif
3939
if ENABLE_GLX
4040
desmume_SOURCES += ../shared/glx_3Demu.h ../shared/glx_3Demu.cpp
4141
else
42-
if ENABLE_OSMESA
43-
desmume_LDADD += $(OSMESA_LIBS)
44-
desmume_SOURCES += ../shared/osmesa_3Demu.h ../shared/osmesa_3Demu.cpp
45-
else
4642
if ENABLE_EGL
4743
desmume_LDADD += $(EGL_LIBS)
4844
desmume_SOURCES += ../shared/egl_3Demu.h ../shared/egl_3Demu.cpp

‎desmume/src/frontend/posix/gtk/doc/desmume.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Select available 3d emulation:
5252
1 = internal desmume software rasterizer (default)
5353
.RE
5454
.RS
55-
2 = osmesa or gtkglext opengl (if available, depending on compilation options, see desmume \-\-help)
55+
2 = gtkglext opengl (if available, depending on compilation options, see desmume \-\-help)
5656
.RE
5757
.TP
5858
.B \-\-disable-sound

‎desmume/src/frontend/posix/gtk/main.cpp

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@
8181

8282
#if defined(ENABLE_GLX)
8383
#include "../shared/glx_3Demu.h"
84-
#elif defined(ENABLE_OSMESA)
85-
#include "../shared/osmesa_3Demu.h"
8684
#elif defined(ENABLE_EGL)
8785
#include "../shared/egl_3Demu.h"
8886
#else
@@ -2325,7 +2323,7 @@ static void GraphicsSettingsDialog(GSimpleAction *action, GVariant *parameter, g
23252323
{
23262324
switch (sel3DCore)
23272325
{
2328-
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_OSMESA) && !defined(ENABLE_GLX)
2326+
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_GLX)
23292327
case 2:
23302328
#if defined(ENABLE_EGL)
23312329
oglrender_init = &egl_initOpenGL_ES_3_0;
@@ -2337,8 +2335,6 @@ static void GraphicsSettingsDialog(GSimpleAction *action, GVariant *parameter, g
23372335
case 2:
23382336
#if defined(ENABLE_GLX)
23392337
oglrender_init = &glx_initOpenGL_StandardAuto;
2340-
#elif defined(ENABLE_OSMESA)
2341-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
23422338
#elif defined(ENABLE_EGL)
23432339
oglrender_init = &egl_initOpenGL_StandardAuto;
23442340
#else
@@ -2349,8 +2345,6 @@ static void GraphicsSettingsDialog(GSimpleAction *action, GVariant *parameter, g
23492345
case 3:
23502346
#if defined(ENABLE_GLX)
23512347
oglrender_init = &glx_initOpenGL_LegacyAuto;
2352-
#elif defined(ENABLE_OSMESA)
2353-
oglrender_init = &osmesa_initOpenGL_LegacyAuto;
23542348
#elif defined(ENABLE_EGL)
23552349
oglrender_init = &egl_initOpenGL_LegacyAuto;
23562350
#else
@@ -2361,8 +2355,6 @@ static void GraphicsSettingsDialog(GSimpleAction *action, GVariant *parameter, g
23612355
case 4:
23622356
#if defined(ENABLE_GLX)
23632357
oglrender_init = &glx_initOpenGL_3_2_CoreProfile;
2364-
#elif defined(ENABLE_OSMESA)
2365-
oglrender_init = &osmesa_initOpenGL_3_2_CoreProfile;
23662358
#elif defined(ENABLE_EGL)
23672359
oglrender_init = &egl_initOpenGL_3_2_CoreProfile;
23682360
#else
@@ -3951,12 +3943,6 @@ common_gtk_main(GApplication *app, gpointer user_data)
39513943
oglrender_beginOpenGL = &glx_beginOpenGL;
39523944
oglrender_endOpenGL = &glx_endOpenGL;
39533945
oglrender_framebufferDidResizeCallback = &glx_framebufferDidResizeCallback;
3954-
#elif defined(ENABLE_OSMESA)
3955-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
3956-
oglrender_deinit = &osmesa_deinitOpenGL;
3957-
oglrender_beginOpenGL = &osmesa_beginOpenGL;
3958-
oglrender_endOpenGL = &osmesa_endOpenGL;
3959-
oglrender_framebufferDidResizeCallback = &osmesa_framebufferDidResizeCallback;
39603946
#elif defined(ENABLE_EGL)
39613947
oglrender_init = &egl_initOpenGL_StandardAuto;
39623948
oglrender_deinit = &egl_deinitOpenGL;
@@ -3998,7 +3984,7 @@ common_gtk_main(GApplication *app, gpointer user_data)
39983984

39993985
switch (core)
40003986
{
4001-
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_OSMESA) && !defined(ENABLE_GLX)
3987+
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_GLX)
40023988
case 2:
40033989
#if defined(ENABLE_EGL)
40043990
oglrender_init = &egl_initOpenGL_ES_3_0;
@@ -4010,8 +3996,6 @@ common_gtk_main(GApplication *app, gpointer user_data)
40103996
case 2:
40113997
#if defined(ENABLE_GLX)
40123998
oglrender_init = &glx_initOpenGL_StandardAuto;
4013-
#elif defined(ENABLE_OSMESA)
4014-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
40153999
#elif defined(ENABLE_EGL)
40164000
oglrender_init = &egl_initOpenGL_StandardAuto;
40174001
#else
@@ -4022,8 +4006,6 @@ common_gtk_main(GApplication *app, gpointer user_data)
40224006
case 3:
40234007
#if defined(ENABLE_GLX)
40244008
oglrender_init = &glx_initOpenGL_LegacyAuto;
4025-
#elif defined(ENABLE_OSMESA)
4026-
oglrender_init = &osmesa_initOpenGL_LegacyAuto;
40274009
#elif defined(ENABLE_EGL)
40284010
oglrender_init = &egl_initOpenGL_LegacyAuto;
40294011
#else
@@ -4034,8 +4016,6 @@ common_gtk_main(GApplication *app, gpointer user_data)
40344016
case 4:
40354017
#if defined(ENABLE_GLX)
40364018
oglrender_init = &glx_initOpenGL_3_2_CoreProfile;
4037-
#elif defined(ENABLE_OSMESA)
4038-
oglrender_init = &osmesa_initOpenGL_3_2_CoreProfile;
40394019
#elif defined(ENABLE_EGL)
40404020
oglrender_init = &egl_initOpenGL_3_2_CoreProfile;
40414021
#else
@@ -4130,8 +4110,6 @@ static void Teardown() {
41304110
#if defined(ENABLE_OPENGL_STANDARD) || defined(ENABLE_OPENGL_ES)
41314111
#if defined(ENABLE_GLX)
41324112
glx_deinitOpenGL();
4133-
#elif defined(ENABLE_OSMESA)
4134-
osmesa_deinitOpenGL();
41354113
#elif defined(ENABLE_EGL)
41364114
egl_deinitOpenGL();
41374115
#else

‎desmume/src/frontend/posix/gtk/meson.build

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,6 @@ if get_option('glx') and dep_gl.found()
2929
desmume_src += [
3030
'../shared/glx_3Demu.cpp',
3131
]
32-
elif get_option('osmesa') and dep_osmesa.found()
33-
desmume_src += [
34-
'../shared/osmesa_3Demu.cpp',
35-
]
3632
elif get_option('egl') and dep_egl.found()
3733
desmume_src += [
3834
'../shared/egl_3Demu.cpp',

‎desmume/src/frontend/posix/gtk2/Makefile.am

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,6 @@ endif
3939
if ENABLE_GLX
4040
desmume_SOURCES += ../shared/glx_3Demu.h ../shared/glx_3Demu.cpp
4141
else
42-
if ENABLE_OSMESA
43-
desmume_LDADD += $(OSMESA_LIBS)
44-
desmume_SOURCES += ../shared/osmesa_3Demu.h ../shared/osmesa_3Demu.cpp
45-
else
4642
if ENABLE_EGL
4743
desmume_LDADD += $(EGL_LIBS)
4844
desmume_SOURCES += ../shared/egl_3Demu.h ../shared/egl_3Demu.cpp

‎desmume/src/frontend/posix/gtk2/doc/desmume.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Select available 3d emulation:
5252
1 = internal desmume software rasterizer (default)
5353
.RE
5454
.RS
55-
2 = osmesa or gtkglext opengl (if available, depending on compilation options, see desmume \-\-help)
55+
2 = gtkglext opengl (if available, depending on compilation options, see desmume \-\-help)
5656
.RE
5757
.TP
5858
.B \-\-disable-sound

‎desmume/src/frontend/posix/gtk2/main.cpp

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@
7777

7878
#if defined(ENABLE_GLX)
7979
#include "../shared/glx_3Demu.h"
80-
#elif defined(ENABLE_OSMESA)
81-
#include "../shared/osmesa_3Demu.h"
8280
#elif defined(ENABLE_EGL)
8381
#include "../shared/egl_3Demu.h"
8482
#else
@@ -2613,7 +2611,7 @@ static void GraphicsSettingsDialog() {
26132611
{
26142612
switch (sel3DCore)
26152613
{
2616-
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_OSMESA) && !defined(ENABLE_GLX)
2614+
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_GLX)
26172615
case 2:
26182616
#if defined(ENABLE_EGL)
26192617
oglrender_init = &egl_initOpenGL_ES_3_0;
@@ -2625,8 +2623,6 @@ static void GraphicsSettingsDialog() {
26252623
case 2:
26262624
#if defined(ENABLE_GLX)
26272625
oglrender_init = &glx_initOpenGL_StandardAuto;
2628-
#elif defined(ENABLE_OSMESA)
2629-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
26302626
#elif defined(ENABLE_EGL)
26312627
oglrender_init = &egl_initOpenGL_StandardAuto;
26322628
#else
@@ -2637,8 +2633,6 @@ static void GraphicsSettingsDialog() {
26372633
case 3:
26382634
#if defined(ENABLE_GLX)
26392635
oglrender_init = &glx_initOpenGL_LegacyAuto;
2640-
#elif defined(ENABLE_OSMESA)
2641-
oglrender_init = &osmesa_initOpenGL_LegacyAuto;
26422636
#elif defined(ENABLE_EGL)
26432637
oglrender_init = &egl_initOpenGL_LegacyAuto;
26442638
#else
@@ -2649,8 +2643,6 @@ static void GraphicsSettingsDialog() {
26492643
case 4:
26502644
#if defined(ENABLE_GLX)
26512645
oglrender_init = &glx_initOpenGL_3_2_CoreProfile;
2652-
#elif defined(ENABLE_OSMESA)
2653-
oglrender_init = &osmesa_initOpenGL_3_2_CoreProfile;
26542646
#elif defined(ENABLE_EGL)
26552647
oglrender_init = &egl_initOpenGL_3_2_CoreProfile;
26562648
#else
@@ -3828,12 +3820,6 @@ common_gtk_main( class configured_features *my_config)
38283820
oglrender_beginOpenGL = &glx_beginOpenGL;
38293821
oglrender_endOpenGL = &glx_endOpenGL;
38303822
oglrender_framebufferDidResizeCallback = &glx_framebufferDidResizeCallback;
3831-
#elif defined(ENABLE_OSMESA)
3832-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
3833-
oglrender_deinit = &osmesa_deinitOpenGL;
3834-
oglrender_beginOpenGL = &osmesa_beginOpenGL;
3835-
oglrender_endOpenGL = &osmesa_endOpenGL;
3836-
oglrender_framebufferDidResizeCallback = &osmesa_framebufferDidResizeCallback;
38373823
#elif defined(ENABLE_EGL)
38383824
oglrender_init = &egl_initOpenGL_StandardAuto;
38393825
oglrender_deinit = &egl_deinitOpenGL;
@@ -3875,7 +3861,7 @@ common_gtk_main( class configured_features *my_config)
38753861

38763862
switch (core)
38773863
{
3878-
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_OSMESA) && !defined(ENABLE_GLX)
3864+
#if defined(ENABLE_OPENGL_ES) && !defined(ENABLE_GLX)
38793865
case 2:
38803866
#if defined(ENABLE_EGL)
38813867
oglrender_init = &egl_initOpenGL_ES_3_0;
@@ -3887,8 +3873,6 @@ common_gtk_main( class configured_features *my_config)
38873873
case 2:
38883874
#if defined(ENABLE_GLX)
38893875
oglrender_init = &glx_initOpenGL_StandardAuto;
3890-
#elif defined(ENABLE_OSMESA)
3891-
oglrender_init = &osmesa_initOpenGL_StandardAuto;
38923876
#elif defined(ENABLE_EGL)
38933877
oglrender_init = &egl_initOpenGL_StandardAuto;
38943878
#else
@@ -3899,8 +3883,6 @@ common_gtk_main( class configured_features *my_config)
38993883
case 3:
39003884
#if defined(ENABLE_GLX)
39013885
oglrender_init = &glx_initOpenGL_LegacyAuto;
3902-
#elif defined(ENABLE_OSMESA)
3903-
oglrender_init = &osmesa_initOpenGL_LegacyAuto;
39043886
#elif defined(ENABLE_EGL)
39053887
oglrender_init = &egl_initOpenGL_LegacyAuto;
39063888
#else
@@ -3911,8 +3893,6 @@ common_gtk_main( class configured_features *my_config)
39113893
case 4:
39123894
#if defined(ENABLE_GLX)
39133895
oglrender_init = &glx_initOpenGL_3_2_CoreProfile;
3914-
#elif defined(ENABLE_OSMESA)
3915-
oglrender_init = &osmesa_initOpenGL_3_2_CoreProfile;
39163896
#elif defined(ENABLE_EGL)
39173897
oglrender_init = &egl_initOpenGL_3_2_CoreProfile;
39183898
#else
@@ -4005,8 +3985,6 @@ common_gtk_main( class configured_features *my_config)
40053985
#if defined(ENABLE_OPENGL_STANDARD) || defined(ENABLE_OPENGL_ES)
40063986
#if defined(ENABLE_GLX)
40073987
glx_deinitOpenGL();
4008-
#elif defined(ENABLE_OSMESA)
4009-
osmesa_deinitOpenGL();
40103988
#elif defined(ENABLE_EGL)
40113989
egl_deinitOpenGL();
40123990
#else

‎desmume/src/frontend/posix/gtk2/meson.build

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@ if get_option('glx') and dep_gl.found()
2222
desmume_src += [
2323
'../shared/glx_3Demu.cpp',
2424
]
25-
elif get_option('osmesa') and dep_osmesa.found()
26-
desmume_src += [
27-
'../shared/osmesa_3Demu.cpp',
28-
]
2925
elif get_option('egl') and dep_egl.found()
3026
desmume_src += [
3127
'../shared/egl_3Demu.cpp',

‎desmume/src/frontend/posix/meson.build

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ dep_alsa = dependency('alsa', required: false)
2222
dep_soundtouch = dependency('soundtouch', required: false)
2323
dep_agg = dependency('libagg', required: false)
2424
dep_fontconfig = dependency('fontconfig', required: false)
25-
dep_osmesa = dependency('osmesa', required: false)
2625
dep_egl = dependency('egl', required: false)
2726

2827
# XXX: something wrong with this one.
@@ -248,20 +247,6 @@ if get_option('glx')
248247
else
249248
message('Cannot use GLX -- gl library not found.')
250249
endif
251-
elif get_option('osmesa')
252-
if dep_osmesa.found()
253-
if get_option('opengl') and dep_gl.found()
254-
message('OSMesa contexts are deprecated.')
255-
add_global_arguments('-DENABLE_OSMESA', language: ['c', 'cpp'])
256-
dependencies += dep_osmesa
257-
elif get_option('opengles')
258-
message('OSMesa contexts are incompatible with OpenGL ES -- cancelling the use of OSMesa.')
259-
else
260-
message('OSMesa contexts are only compatible with standard OpenGL -- cancelling the use of OSMesa.')
261-
endif
262-
else
263-
message('Cannot use OSMesa -- osmesa library not found.')
264-
endif
265250
elif get_option('egl')
266251
if dep_egl.found()
267252
add_global_arguments('-DENABLE_EGL', language: ['c', 'cpp'])

0 commit comments

Comments
 (0)