Use OpenGL 3.3 core profile instead of compatibility profile
- Rename OpenGL to GLES3 in the source code per community feedback.
- The renderer is still exposed as "OpenGL 3" to the user.
- Hide renderer selection dropdown until OpenGL support is more mature.
- The renderer can still be changed in the Project Settings or using
the `--rendering-driver opengl` command line argument.
- Remove commented out exporter code.
- Remove some OpenGL/DisplayServer-related debugging prints.
This commit is contained in:
parent
ce97ddbcb1
commit
8a10bb7d0d
83 changed files with 2155 additions and 8187 deletions
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
// 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)
|
||||
//#if defined(GLES3_ENABLED)
|
||||
//@interface AppDelegate : NSObject <UIApplicationDelegate, GLViewDelegate> {
|
||||
//#endif
|
||||
//#if defined(VULKAN_ENABLED)
|
||||
|
|
|
|||
|
|
@ -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") == "opengl") {
|
||||
if (GLOBAL_GET("rendering/driver/driver_name") == "opengl3") {
|
||||
context = [[EAGLContext alloc] initWithAPI:kEAGLRenderingAPIOpenGLES2];
|
||||
NSLog(@"Setting up an OpenGL ES 2.0 context.");
|
||||
if (!context) {
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ DisplayServerIPhone *DisplayServerIPhone::get_singleton() {
|
|||
DisplayServerIPhone::DisplayServerIPhone(const String &p_rendering_driver, WindowMode p_mode, DisplayServer::VSyncMode p_vsync_mode, uint32_t p_flags, const Vector2i &p_resolution, Error &r_error) {
|
||||
rendering_driver = p_rendering_driver;
|
||||
|
||||
#if defined(OPENGL_ENABLED)
|
||||
#if defined(GLES3_ENABLED)
|
||||
// FIXME: Add support for both OpenGL and Vulkan when OpenGL is implemented
|
||||
// again,
|
||||
|
||||
|
|
@ -60,9 +60,9 @@ DisplayServerIPhone::DisplayServerIPhone(const String &p_rendering_driver, Windo
|
|||
|
||||
// FIXME: Add Vulkan support via MoltenVK. Add fallback code back?
|
||||
|
||||
if (RasterizerOpenGLis_viable() == OK) {
|
||||
RasterizerOpenGLregister_config();
|
||||
RasterizerOpenGLmake_current();
|
||||
if (RasterizerGLES3::is_viable() == OK) {
|
||||
RasterizerGLES3::register_config();
|
||||
RasterizerGLES3::make_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
|
||||
// RasterizerStorageOpenGLsystem_fbo = gl_view_base_fb;
|
||||
// RasterizerStorageGLES3system_fbo = gl_view_base_fb;
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -157,7 +157,7 @@ Vector<String> DisplayServerIPhone::get_rendering_drivers_func() {
|
|||
#if defined(VULKAN_ENABLED)
|
||||
drivers.push_back("vulkan");
|
||||
#endif
|
||||
#if defined(OPENGL_ENABLED)
|
||||
#if defined(GLES3_ENABLED)
|
||||
drivers.push_back("opengl_es");
|
||||
#endif
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
Loading…
Add table
Add a link
Reference in a new issue