From ce97ddbcb125228cc88fbfdcae932e110ee7daee Mon Sep 17 00:00:00 2001 From: Hugo Locurcio Date: Mon, 27 Sep 2021 01:07:10 +0200 Subject: Rename GLES2 driver to OpenGL to prepare for the upgrade to GLES3 - Use lowercase driver names for the `--rendering-driver` command line argument. --- platform/javascript/display_server_javascript.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'platform/javascript/display_server_javascript.cpp') diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index c2eb826db9..dacae912b5 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -677,7 +677,7 @@ DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_drive // Expose method for requesting quit. godot_js_os_request_quit_cb(request_quit_callback); - RasterizerDummy::make_current(); // TODO GLES2 in Godot 4.0... or webgpu? + RasterizerDummy::make_current(); // TODO OpenGL in Godot 4.0... or webgpu? #if 0 EmscriptenWebGLContextAttributes attributes; emscripten_webgl_init_context_attributes(&attributes); @@ -691,10 +691,10 @@ DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_drive bool gl_initialization_error = false; - if (RasterizerGLES2::is_viable() == OK) { + if (RasterizerOpenGLis_viable() == OK) { attributes.majorVersion = 1; - RasterizerGLES2::register_config(); - RasterizerGLES2::make_current(); + RasterizerOpenGLregister_config(); + RasterizerOpenGLmake_current(); } else { gl_initialization_error = true; } -- cgit v1.2.3 From 8a10bb7d0dd0cc03353bb751af25a0eca1357c9d Mon Sep 17 00:00:00 2001 From: Clay John Date: Tue, 26 Oct 2021 08:18:39 -0700 Subject: 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. --- platform/javascript/display_server_javascript.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'platform/javascript/display_server_javascript.cpp') diff --git a/platform/javascript/display_server_javascript.cpp b/platform/javascript/display_server_javascript.cpp index dacae912b5..c7d68019a1 100644 --- a/platform/javascript/display_server_javascript.cpp +++ b/platform/javascript/display_server_javascript.cpp @@ -691,10 +691,10 @@ DisplayServerJavaScript::DisplayServerJavaScript(const String &p_rendering_drive bool gl_initialization_error = false; - if (RasterizerOpenGLis_viable() == OK) { + if (RasterizerGLES3::is_viable() == OK) { attributes.majorVersion = 1; - RasterizerOpenGLregister_config(); - RasterizerOpenGLmake_current(); + RasterizerGLES3::register_config(); + RasterizerGLES3::make_current(); } else { gl_initialization_error = true; } -- cgit v1.2.3