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

Merge pull request #37347 from akien-mga/displayserver-fix-create-func 

DisplayServer: Fix registration of GetRenderingDriversFunction
This commit is contained in:
Rémi Verschelde 2020-03-27 15:51:29 +01:00 committed by GitHub
parent 92d25e62f7 fe3566e190
commit f48aeeeeef
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
main/main.cpp
View File

@ -271,16 +271,22 @@ void Main::print_help(const char *p_binary) {
OS::get_singleton()->print(" --render-thread <mode> Render thread mode ('unsafe', 'safe', 'separate').\n"); OS::get_singleton()->print(" --render-thread <mode> Render thread mode ('unsafe', 'safe', 'separate').\n");
OS::get_singleton()->print(" --remote-fs <address> Remote filesystem (<host/IP>[:<port>] address).\n"); OS::get_singleton()->print(" --remote-fs <address> Remote filesystem (<host/IP>[:<port>] address).\n");
OS::get_singleton()->print(" --remote-fs-password <password> Password for remote filesystem.\n"); OS::get_singleton()->print(" --remote-fs-password <password> Password for remote filesystem.\n");
OS::get_singleton()->print(" --audio-driver <driver> Audio driver (");
OS::get_singleton()->print(" --audio-driver <driver> Audio driver [");
for (int i = 0; i < AudioDriverManager::get_driver_count(); i++) { for (int i = 0; i < AudioDriverManager::get_driver_count(); i++) {
if (i != 0) if (i > 0) {
OS::get_singleton()->print(", "); OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s'", AudioDriverManager::get_driver(i)->get_name()); OS::get_singleton()->print("'%s'", AudioDriverManager::get_driver(i)->get_name());
} }
OS::get_singleton()->print(").\n"); OS::get_singleton()->print("].\n");
OS::get_singleton()->print(" --display-driver <driver> Display driver (and rendering driver):\n");
OS::get_singleton()->print(" --display-driver <driver> Display driver (and rendering driver) [");
for (int i = 0; i < DisplayServer::get_create_function_count(); i++) { for (int i = 0; i < DisplayServer::get_create_function_count(); i++) {
OS::get_singleton()->print("\t\t'%s' (", DisplayServer::get_create_function_name(i)); if (i > 0) {
OS::get_singleton()->print(", ");
}
OS::get_singleton()->print("'%s' (", DisplayServer::get_create_function_name(i));
Vector<String> rd = DisplayServer::get_create_function_rendering_drivers(i); Vector<String> rd = DisplayServer::get_create_function_rendering_drivers(i);
for (int j = 0; j < rd.size(); j++) { for (int j = 0; j < rd.size(); j++) {
if (j > 0) { if (j > 0) {
@ -288,9 +294,11 @@ void Main::print_help(const char *p_binary) {
} }
OS::get_singleton()->print("'%s'", rd[j].utf8().get_data()); OS::get_singleton()->print("'%s'", rd[j].utf8().get_data());
} }
OS::get_singleton()->print(")\n"); OS::get_singleton()->print(")");
} }
OS::get_singleton()->print("].\n");
OS::get_singleton()->print(" --rendering-driver <driver> Rendering driver (depends on display driver).\n"); OS::get_singleton()->print(" --rendering-driver <driver> Rendering driver (depends on display driver).\n");
OS::get_singleton()->print("\n");
#ifndef SERVER_ENABLED #ifndef SERVER_ENABLED
OS::get_singleton()->print("Display options:\n"); OS::get_singleton()->print("Display options:\n");
@ -340,7 +348,7 @@ void Main::print_help(const char *p_binary) {
#ifdef DEBUG_METHODS_ENABLED #ifdef DEBUG_METHODS_ENABLED
OS::get_singleton()->print(" --gdnative-generate-json-api Generate JSON dump of the Godot API for GDNative bindings.\n"); OS::get_singleton()->print(" --gdnative-generate-json-api Generate JSON dump of the Godot API for GDNative bindings.\n");
#endif #endif
OS::get_singleton()->print(" --test <test> Run a unit test ("); OS::get_singleton()->print(" --test <test> Run a unit test [");
const char **test_names = tests_get_names(); const char **test_names = tests_get_names();
const char *comma = ""; const char *comma = "";
while (*test_names) { while (*test_names) {
@ -348,7 +356,7 @@ void Main::print_help(const char *p_binary) {
test_names++; test_names++;
comma = ", "; comma = ", ";
} }
OS::get_singleton()->print(").\n"); OS::get_singleton()->print("].\n");
#endif #endif
} }

7
servers/display_server.cpp
View File

@ -540,15 +540,18 @@ void DisplayServer::_bind_methods() {
BIND_ENUM_CONSTANT(WINDOW_EVENT_DPI_CHANGE); BIND_ENUM_CONSTANT(WINDOW_EVENT_DPI_CHANGE);
} }
void DisplayServer::register_create_function(const char *p_name, CreateFunction p_function, GetVideoDriversFunction p_get_drivers) { void DisplayServer::register_create_function(const char *p_name, CreateFunction p_function, GetRenderingDriversFunction p_get_drivers) {
ERR_FAIL_COND(server_create_count == MAX_SERVERS); ERR_FAIL_COND(server_create_count == MAX_SERVERS);
server_create_functions[server_create_count].create_function = p_function;
server_create_functions[server_create_count].name = p_name; server_create_functions[server_create_count].name = p_name;
server_create_functions[server_create_count].create_function = p_function;
server_create_functions[server_create_count].get_rendering_drivers_function = p_get_drivers;
server_create_count++; server_create_count++;
} }
int DisplayServer::get_create_function_count() { int DisplayServer::get_create_function_count() {
return server_create_count; return server_create_count;
} }
const char *DisplayServer::get_create_function_name(int p_index) { const char *DisplayServer::get_create_function_name(int p_index) {
ERR_FAIL_INDEX_V(p_index, server_create_count, nullptr); ERR_FAIL_INDEX_V(p_index, server_create_count, nullptr);
return server_create_functions[p_index].name; return server_create_functions[p_index].name;

10
servers/display_server.h
View File

@ -57,8 +57,9 @@ public:
WINDOW_MODE_FULLSCREEN WINDOW_MODE_FULLSCREEN
}; };
typedef DisplayServer *(*CreateFunction)(const String &, WindowMode, uint32_t, const Size2i &, Error &r_error); //video driver, window mode, resolution typedef DisplayServer *(*CreateFunction)(const String &, WindowMode, uint32_t, const Size2i &, Error &r_error);
typedef Vector<String> (*GetVideoDriversFunction)(); //video driver, window mode, resolution typedef Vector<String> (*GetRenderingDriversFunction)();
private: private:
static void _input_set_mouse_mode(InputFilter::MouseMode p_mode); static void _input_set_mouse_mode(InputFilter::MouseMode p_mode);
static InputFilter::MouseMode _input_get_mouse_mode(); static InputFilter::MouseMode _input_get_mouse_mode();
@ -68,14 +69,15 @@ private:
protected: protected:
static void _bind_methods(); static void _bind_methods();
enum { enum {
MAX_SERVERS = 64 MAX_SERVERS = 64
}; };
struct DisplayServerCreate { struct DisplayServerCreate {
const char *name; const char *name;
GetVideoDriversFunction get_rendering_drivers_function;
CreateFunction create_function; CreateFunction create_function;
GetRenderingDriversFunction get_rendering_drivers_function;
}; };
static DisplayServerCreate server_create_functions[MAX_SERVERS]; static DisplayServerCreate server_create_functions[MAX_SERVERS];
@ -361,7 +363,7 @@ public:
virtual void set_context(Context p_context); virtual void set_context(Context p_context);
static void register_create_function(const char *p_name, CreateFunction p_function, GetVideoDriversFunction p_get_drivers); static void register_create_function(const char *p_name, CreateFunction p_function, GetRenderingDriversFunction p_get_drivers);
static int get_create_function_count(); static int get_create_function_count();
static const char *get_create_function_name(int p_index); static const char *get_create_function_name(int p_index);
static Vector<String> get_create_function_rendering_drivers(int p_index); static Vector<String> get_create_function_rendering_drivers(int p_index);