godotengine/godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17158 from bruvzg/gles2_driver_select

Browse Source 
[GLES2] Renderer selection improvement
This commit is contained in:
Rémi Verschelde 2018-03-02 18:43:18 +01:00 committed by GitHub
commit 8d01b706ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
main/main.cpp
View File

@ -829,8 +829,11 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph
OS::get_singleton()->set_cmdline(execpath, main_args); OS::get_singleton()->set_cmdline(execpath, main_args);
//if (video_driver == "") // useless for now, so removing GLOBAL_DEF("rendering/quality/driver/driver_name", "GLES3");
// video_driver = GLOBAL_DEF("display/driver/name", Variant((const char *)OS::get_singleton()->get_video_driver_name(0))); ProjectSettings::get_singleton()->set_custom_property_info("rendering/quality/driver/driver_name", PropertyInfo(Variant::STRING, "rendering/quality/driver/driver_name", PROPERTY_HINT_ENUM, "GLES3,GLES2"));
if (video_driver == "") {
video_driver = GLOBAL_GET("rendering/quality/driver/driver_name");
}
GLOBAL_DEF("display/window/size/width", 1024); GLOBAL_DEF("display/window/size/width", 1024);
GLOBAL_DEF("display/window/size/height", 600); GLOBAL_DEF("display/window/size/height", 600);

2
platform/osx/os_osx.mm
View File

@ -1181,8 +1181,6 @@ Error OS_OSX::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
/*** END OSX INITIALIZATION ***/ /*** END OSX INITIALIZATION ***/
bool use_gl2 = p_video_driver != 1;
AudioDriverManager::add_driver(&audio_driver); AudioDriverManager::add_driver(&audio_driver);
// only opengl support here... // only opengl support here...

20
platform/x11/os_x11.cpp
View File

@ -78,19 +78,23 @@
#include <X11/XKBlib.h> #include <X11/XKBlib.h>
int OS_X11::get_video_driver_count() const { int OS_X11::get_video_driver_count() const {
return 1;
return 2;
} }
const char *OS_X11::get_video_driver_name(int p_driver) const { const char *OS_X11::get_video_driver_name(int p_driver) const {
String driver_name = GLOBAL_GET("rendering/quality/driver/driver_name");
if (driver_name == "GLES2") { switch (p_driver) {
return "GLES2"; case VIDEO_DRIVER_GLES2:
return "GLES2";
case VIDEO_DRIVER_GLES3:
default:
return "GLES3";
} }
return "GLES3";
} }
int OS_X11::get_audio_driver_count() const { int OS_X11::get_audio_driver_count() const {
return AudioDriverManager::get_driver_count(); return AudioDriverManager::get_driver_count();
} }
@ -289,13 +293,9 @@ Error OS_X11::initialize(const VideoMode &p_desired, int p_video_driver, int p_a
//print_line("def videomode "+itos(current_videomode.width)+","+itos(current_videomode.height)); //print_line("def videomode "+itos(current_videomode.width)+","+itos(current_videomode.height));
#if defined(OPENGL_ENABLED) #if defined(OPENGL_ENABLED)
String setting_name = "rendering/quality/driver/driver_name";
ProjectSettings::get_singleton()->set_custom_property_info(setting_name, PropertyInfo(Variant::STRING, setting_name, PROPERTY_HINT_ENUM, "GLES3,GLES2"));
String video_driver_name = GLOBAL_DEF("rendering/quality/driver/driver_name", "GLES3");
ContextGL_X11::ContextType opengl_api_type = ContextGL_X11::GLES_3_0_COMPATIBLE; ContextGL_X11::ContextType opengl_api_type = ContextGL_X11::GLES_3_0_COMPATIBLE;
if (video_driver_name == "GLES2") { if (p_video_driver == VIDEO_DRIVER_GLES2) {
opengl_api_type = ContextGL_X11::GLES_2_0_COMPATIBLE; opengl_api_type = ContextGL_X11::GLES_2_0_COMPATIBLE;
} }

5
platform/x11/os_x11.h
View File

@ -53,6 +53,11 @@
#include <X11/extensions/XInput2.h> #include <X11/extensions/XInput2.h>
#endif #endif
enum VideoDriver {
VIDEO_DRIVER_GLES3,
VIDEO_DRIVER_GLES2
};
// Hints for X11 fullscreen // Hints for X11 fullscreen
typedef struct { typedef struct {
unsigned long flags; unsigned long flags;