OpenGL ES 3.0/ANGLE support on macOS (#190)

* fixing OpenGL ES 3.0 support in macOS

* make GLES libraries loaded via buildconf vars

* fix relative install paths for macOS

* fix indenting, add comments

* fix indentation for REAL this time (thanks editorconfig)

meson.build

@@ -350,21 +350,49 @@ if host_machine.system() == 'windows'
         )
     endif
 
-    if angle_enabled
-        install_data(
-            get_option('angle_libgles'),
-            get_option('angle_libegl'),
-            install_dir : join_paths(bindir, 'ANGLE'),
-        )
-    endif
 else
     if install_docs
         install_data('COPYING', install_dir : doc_path)
     endif
 
-    if angle_enabled
-        error('install_angle is only available for Windows targets at the moment')
+endif
+
+if angle_enabled
+    angle_dir = 'ANGLE'
+
+    if host_machine.system() == 'windows'
+        angle_path = angle_dir + '\\'
+        gles_filename = angle_path + 'libGLESv2.dll'
+        egl_filename = angle_path + 'libEGL.dll'
+        # activate the Windows-Intel-ANGLE workaround
+        config.set('TAISEI_BUILDCONF_WINDOWS_ANGLE_INTEL', 1)
+    elif host_machine.system() == 'darwin'
+        # this is relative to SDL_GetBasePath()
+        # easiest way to traverse is to go up one dir
+        angle_path = 'MacOS/' + angle_dir + '/'
+        if not macos_app_bundle
+            # if the user decides not to use the app bundle on macOS
+            angle_path = 'lib/' + angle_dir + '/'
+        endif
+        gles_filename = '../' + angle_path + 'libGLESv2.dylib'
+        egl_filename = '../' + angle_path + 'libEGL.dylib'
+    else
+        # FIXME: for Linux
+        angle_path = 'lib/' + angle_dir + '/'
+        gles_filename = '../' + angle_path + 'libGLESv2.so'
+        egl_filename = '../' + angle_path + 'libEGL.so'
     endif
+
+    # used in gles.c for determining what libraries to use
+    config.set_quoted('TAISEI_BUILDCONF_ANGLE_GLES_PATH', gles_filename )
+    config.set_quoted('TAISEI_BUILDCONF_ANGLE_EGL_PATH', egl_filename )
+
+    # installs ANGLE to the paths specified
+    install_data(
+        get_option('angle_libgles'),
+        get_option('angle_libegl'),
+        install_dir : angle_path,
+    )
 endif
 
 systype = (have_posix ? 'POSIX (@0@)' : '@0@').format(host_machine.system())

meson_options.txt

@@ -43,7 +43,7 @@ option(
     'install_angle',
     type : 'boolean',
     value : 'false',
-    description : 'Install pre-built ANGLE libraries. Only makes sense with a GLES backend. Currently only supported on Windows'
+    description : 'Install pre-built ANGLE libraries. Required for Windows/macOS OpenGL ES 2.0/3.0'
 )
 
 option(

misc/Info.plist.in

@@ -22,6 +22,8 @@
     <string>????</string>
     <key>CFBundleVersion</key>
     <string>${VERSION({major}.{minor}.{patch}.{tweak})}</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.arcade-games</string>
     <key>NSHumanReadableCopyright</key>
     <string>© 2011-2019, Taisei Project</string>
 </dict>

misc/meson.build

@@ -4,7 +4,8 @@ if macos_app_bundle
 
     plist = custom_target('macOS property list',
         command : [preprocess_command, '@INPUT@', '@OUTPUT@'],
-        build_always : true,
+        build_by_default : true,
+        build_always_stale : true,
         input : 'Info.plist.in',
         output : 'Info.plist',
         install : true,

src/meson.build

@@ -1,7 +1,8 @@
 
 version_deps += custom_target('version information',
     command : [preprocess_command, '@INPUT@', '@OUTPUT@'],
-    build_always : true,
+    build_by_default : true,
+    build_always_stale : true,
     input : 'version_auto.c.in',
     output : 'version_auto.c',
 )
@@ -30,7 +31,8 @@ if host_machine.system() == 'windows'
     # https://github.com/mesonbuild/meson/issues/4301
     rc_target = custom_target('windows-resource',
         command : [preprocess_command, rcdefs, '@INPUT@', '@OUTPUT@'],
-        build_always : true,
+        build_always_stale : true,
+        build_by_default : true,
         input : 'taisei.rc.in',
         output : 'taisei.rc',
     )

src/renderer/glcommon/opengl.c

@@ -651,7 +651,7 @@ static const char *get_unmasked_property(GLenum prop, bool fallback) {
 }
 
 static void detect_broken_intel_driver(void) {
-#ifdef TAISEI_BUILDCONF_HAVE_WINDOWS_ANGLE_FALLBACK
+#ifdef TAISEI_BUILDCONF_WINDOWS_ANGLE_INTEL
 	extern DECLSPEC int SDLCALL SDL_ShowMessageBox(const SDL_MessageBoxData *messageboxdata, int *buttonid);
 
 	bool is_broken_intel_driver = (
@@ -719,6 +719,7 @@ static void detect_broken_intel_driver(void) {
 	);
 
 	exit(0);
+
 #endif
 }
 

src/renderer/glescommon/gles.c

@@ -14,18 +14,22 @@
 #include "../gl33/gl33.h"
 
 void gles_init(RendererBackend *gles_backend, int major, int minor) {
-#ifdef TAISEI_BUILDCONF_HAVE_WINDOWS_ANGLE_FALLBACK
+#ifdef TAISEI_BUILDCONF_HAVE_ANGLE
+	// for loading ANGLE libraries
 	char *basepath = SDL_GetBasePath();
-	size_t basepath_len = strlen(basepath);
-	char buf[basepath_len + 32];
-	snprintf(buf, sizeof(buf), "%sANGLE\\", basepath);
-	SDL_free(basepath);
-	basepath_len += sizeof("ANGLE");
-	strlcpy(buf + basepath_len, "libGLESv2.dll", sizeof(buf) - basepath_len);
+	char buf[128];
+	
+	// SDL_*_DRIVER are SDL-specific env vars
+	snprintf(buf, sizeof(buf), "%s%s", basepath, TAISEI_BUILDCONF_ANGLE_GLES_PATH);
 	env_set("SDL_VIDEO_GL_DRIVER", buf, false);
-	strlcpy(buf + basepath_len, "libEGL.dll", sizeof(buf) - basepath_len);
+
+	snprintf(buf, sizeof(buf), "%s%s", basepath, TAISEI_BUILDCONF_ANGLE_EGL_PATH);
 	env_set("SDL_VIDEO_EGL_DRIVER", buf, false);
+
+	SDL_free(basepath);
+
 	env_set("SDL_OPENGL_ES_DRIVER", 1, false);
+
 #endif
 
 	_r_backend_inherit(gles_backend, &_r_backend_gl33);

src/renderer/meson.build

@@ -61,8 +61,11 @@ endforeach
 r_macro = ' '.join(r_macro)
 config.set('TAISEI_BUILDCONF_RENDERER_BACKENDS', r_macro)
 config.set_quoted('TAISEI_BUILDCONF_RENDERER_DEFAULT', default_renderer)
-config.set('TAISEI_BUILDCONF_HAVE_WINDOWS_ANGLE_FALLBACK',
-    host_machine.system() == 'windows' and
-    enabled_renderers.contains('gles30') and
-    get_option('install_angle')
-)
+
+if angle_enabled
+    if enabled_renderers.contains('gles30') or enabled_renderers.contains('gles20')
+        config.set('TAISEI_BUILDCONF_HAVE_ANGLE', 1)
+    else
+        error('you should enable gles30 and/or gles20 with ANGLE')
+    endif
+endif