diff options
| author | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-09-27 01:07:10 +0200 |
|---|---|---|
| committer | Hugo Locurcio <hugo.locurcio@hugo.pro> | 2021-10-30 02:05:49 +0200 |
| commit | ce97ddbcb125228cc88fbfdcae932e110ee7daee (patch) | |
| tree | f3e2f17be75973806d6f468826e0232cf35b247a /platform/iphone | |
| parent | e3491a37445014cc3527d6f2c1467063222b2dd8 (diff) | |
Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3
- Use lowercase driver names for the `--rendering-driver`
command line argument.
Diffstat (limited to 'platform/iphone')
| -rw-r--r-- | platform/iphone/app_delegate.h | 2 | ||||
| -rw-r--r-- | platform/iphone/display_layer.mm | 2 | ||||
| -rw-r--r-- | platform/iphone/display_server_iphone.mm | 10 | ||||
| -rw-r--r-- | platform/iphone/platform_config.h | 3 |
4 files changed, 8 insertions, 9 deletions
diff --git a/platform/iphone/app_delegate.h b/platform/iphone/app_delegate.h index d6a2292dd2..68cfde6508 100644 --- a/platform/iphone/app_delegate.h +++ b/platform/iphone/app_delegate.h @@ -32,7 +32,7 @@ @class ViewController; -// FIXME: Add support for both GLES2 and Vulkan when GLES2 is implemented again, +// FIXME: Add support for both OpenGL and Vulkan when OpenGL is implemented again, // so it can't be done with compilation time branching. //#if defined(OPENGL_ENABLED) //@interface AppDelegate : NSObject <UIApplicationDelegate, GLViewDelegate> { diff --git a/platform/iphone/display_layer.mm b/platform/iphone/display_layer.mm index b8df81b89a..afa75f53ed 100644 --- a/platform/iphone/display_layer.mm +++ b/platform/iphone/display_layer.mm @@ -89,7 +89,7 @@ // FIXME: Add Vulkan support via MoltenVK. Add fallback code back? // Create GL ES 2 context - if (GLOBAL_GET("rendering/driver/driver_name") == "GLES2") { + if (GLOBAL_GET("rendering/driver/driver_name") == "opengl") { context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2]; NSLog(@"Setting up an OpenGL ES 2.0 context."); if (!context) { diff --git a/platform/iphone/display_server_iphone.mm b/platform/iphone/display_server_iphone.mm index e18448fb6d..33601da1c8 100644 --- a/platform/iphone/display_server_iphone.mm +++ b/platform/iphone/display_server_iphone.mm @@ -52,7 +52,7 @@ DisplayServerIPhone::DisplayServerIPhone(const String &p_rendering_driver, Windo rendering_driver = p_rendering_driver; #if defined(OPENGL_ENABLED) - // FIXME: Add support for both GLES2 and Vulkan when GLES2 is implemented + // FIXME: Add support for both OpenGL and Vulkan when OpenGL is implemented // again, if (rendering_driver == "opengl_es") { @@ -60,9 +60,9 @@ DisplayServerIPhone::DisplayServerIPhone(const String &p_rendering_driver, Windo // FIXME: Add Vulkan support via MoltenVK. Add fallback code back? - if (RasterizerGLES2::is_viable() == OK) { - RasterizerGLES2::register_config(); - RasterizerGLES2::make_current(); + if (RasterizerOpenGLis_viable() == OK) { + RasterizerOpenGLregister_config(); + RasterizerOpenGLmake_current(); } else { gl_initialization_error = true; } @@ -83,7 +83,7 @@ DisplayServerIPhone::DisplayServerIPhone(const String &p_rendering_driver, Windo // reset this to what it should be, it will have been set to 0 after // rendering_server->init() is called - // RasterizerStorageGLES2::system_fbo = gl_view_base_fb; + // RasterizerStorageOpenGLsystem_fbo = gl_view_base_fb; } #endif diff --git a/platform/iphone/platform_config.h b/platform/iphone/platform_config.h index f8a8eb15d2..68ef4e31a7 100644 --- a/platform/iphone/platform_config.h +++ b/platform/iphone/platform_config.h @@ -30,8 +30,7 @@ #include <alloca.h> -#define GLES2_INCLUDE_H <ES2/gl.h> -#define GLES3_INCLUDE_H <ES3/gl.h> +#define OPENGL_INCLUDE_H <ES3/gl.h> #define PLATFORM_REFCOUNT |