[Scummvm-git-logs] scummvm master -> ee11c85f85f241234c9a54ed88b7d4c7a011ab70

[aquadran]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ee11c85f85 IOS: Added support for GLAD


Commit: ee11c85f85f241234c9a54ed88b7d4c7a011ab70
    https://github.com/scummvm/scummvm/commit/ee11c85f85f241234c9a54ed88b7d4c7a011ab70
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2022-03-06T21:44:19+01:00

Commit Message:
IOS: Added support for GLAD

Changed paths:
    backends/platform/ios7/ios7_common.h
    backends/platform/ios7/ios7_osys_main.cpp
    graphics/opengl/context.cpp


diff --git a/backends/platform/ios7/ios7_common.h b/backends/platform/ios7/ios7_common.h
index c58cbe82c0f..481f029789b 100644
--- a/backends/platform/ios7/ios7_common.h
+++ b/backends/platform/ios7/ios7_common.h
@@ -112,6 +112,7 @@ bool iOS7_isBigDevice();
 
 void iOS7_buildSharedOSystemInstance();
 void iOS7_main(int argc, char **argv);
+void *iOS7_getProcAddress(const char *name);
 const char *iOS7_getDocumentsDir();
 bool iOS7_touchpadModeEnabled();
 
diff --git a/backends/platform/ios7/ios7_osys_main.cpp b/backends/platform/ios7/ios7_osys_main.cpp
index a85a709ae98..f6083b7f3af 100644
--- a/backends/platform/ios7/ios7_osys_main.cpp
+++ b/backends/platform/ios7/ios7_osys_main.cpp
@@ -27,6 +27,7 @@
 
 #include <sys/time.h>
 #include <QuartzCore/QuartzCore.h>
+#include <dlfcn.h>
 
 #include "common/scummsys.h"
 #include "common/util.h"
@@ -412,3 +413,7 @@ void iOS7_main(int argc, char **argv) {
 		fclose(newfp);
 	}
 }
+
+void *iOS7_getProcAddress(const char *name) {
+	return dlsym(RTLD_SELF, name);
+}
diff --git a/graphics/opengl/context.cpp b/graphics/opengl/context.cpp
index 4076fe22654..8ad8fb1e4d1 100644
--- a/graphics/opengl/context.cpp
+++ b/graphics/opengl/context.cpp
@@ -47,6 +47,13 @@ static GLADapiproc loadFunc(void *userptr, const char *name) {
 	return (GLADapiproc)androidGLgetProcAddress(name);
 }
 
+#elif defined(IPHONE_IOS7)
+#include "backends/platform/ios7/ios7_common.h"
+
+static GLADapiproc loadFunc(void *userptr, const char *name) {
+	return (GLADapiproc)iOS7_getProcAddress(name);
+}
+
 #else
 #error Not implemented
 #endif