Skip to content

GL: drop unused MacOS warning workaround

Eric Engestrom requested to merge eric/mesa:building_mesa into master

Originally introduced in c7f36574 ("darwin: Suppress type conversion warnings for GLhandleARB") to fix Bugzilla #66346, this workaround has never been active on Meson, which doesn't seem to prevent it from building on MacOS, so either the Mesa codebase has evolved or MacOS's compiler toolchain has, but either way we do not appear to need to carry this local modification of the Khronos headers anymore, so let's just drop it.

/cc @cap @jrfonseca @evelikov @vlee @mattst88

Alternatively, if the workaround is still needed for something that isn't currently being built by Travis, adding support to Meson for this workaround is trivial:

diff --git a/meson.build b/meson.build
index f4c013a5319797a16109..d7f98efedd3227208818 100644
--- a/meson.build
+++ b/meson.build
@@ -252,6 +252,7 @@ endif
 
 if host_machine.system() == 'darwin'
   with_dri_platform = 'apple'
+  pre_args += '-DBUILDING_MESA'
 elif ['windows', 'cygwin'].contains(host_machine.system())
   with_dri_platform = 'windows'
 elif system_has_kms_drm

Merge request reports