diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.cpp | 37 |
1 files changed, 28 insertions, 9 deletions
diff --git a/main/main.cpp b/main/main.cpp index b463264a73..5e54a52f61 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -132,7 +132,6 @@ static InputMap *input_map = nullptr; static TranslationServer *translation_server = nullptr; static Performance *performance = nullptr; static PackedData *packed_data = nullptr; -static Time *time_singleton = nullptr; #ifdef MINIZIP_ENABLED static ZipArchive *zip_packed_data = nullptr; #endif @@ -870,7 +869,6 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph MAIN_PRINT("Main: Initialize Globals"); input_map = memnew(InputMap); - time_singleton = memnew(Time); globals = memnew(ProjectSettings); register_core_settings(); //here globals are present @@ -1951,6 +1949,33 @@ Error Main::setup(const char *execpath, int argc, char *argv[], bool p_second_ph BLOCK_DEVICE("ATI", "Radeon (TM) R9 M3"); BLOCK_DEVICE("AMD", "Radeon (TM) R9 M3"); + // Intel GPUs. + BLOCK_DEVICE("0x8086", "0x0042"); // HD Graphics, Gen5, Clarkdale + BLOCK_DEVICE("0x8086", "0x0046"); // HD Graphics, Gen5, Arrandale + BLOCK_DEVICE("0x8086", "0x010A"); // HD Graphics, Gen6, Sandy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics 2000"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics 2000"); + BLOCK_DEVICE("0x8086", "0x0102"); // HD Graphics 2000, Gen6, Sandy Bridge + BLOCK_DEVICE("0x8086", "0x0116"); // HD Graphics 3000, Gen6, Sandy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics 3000"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics 3000"); + BLOCK_DEVICE("0x8086", "0x0126"); // HD Graphics 3000, Gen6, Sandy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics P3000"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics P3000"); + BLOCK_DEVICE("0x8086", "0x0112"); // HD Graphics P3000, Gen6, Sandy Bridge + BLOCK_DEVICE("0x8086", "0x0122"); // HD Graphics P3000, Gen6, Sandy Bridge + BLOCK_DEVICE("0x8086", "0x015A"); // HD Graphics, Gen7, Ivy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics 2500"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics 2500"); + BLOCK_DEVICE("0x8086", "0x0152"); // HD Graphics 2500, Gen7, Ivy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics 4000"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics 4000"); + BLOCK_DEVICE("0x8086", "0x0162"); // HD Graphics 4000, Gen7, Ivy Bridge + BLOCK_DEVICE("0x8086", "0x0166"); // HD Graphics 4000, Gen7, Ivy Bridge + BLOCK_DEVICE("Intel", "Intel HD Graphics P4000"); + BLOCK_DEVICE("Intel", "Intel(R) HD Graphics P4000"); + BLOCK_DEVICE("0x8086", "0x016A"); // HD Graphics P4000, Gen7, Ivy Bridge + #undef BLOCK_DEVICE GLOBAL_DEF_RST_NOVAL(PropertyInfo(Variant::ARRAY, "rendering/gl_compatibility/force_angle_on_devices", PROPERTY_HINT_ARRAY_TYPE, vformat("%s/%s:%s", Variant::DICTIONARY, PROPERTY_HINT_NONE, String())), device_blocklist); @@ -2365,9 +2390,6 @@ error: if (input_map) { memdelete(input_map); } - if (time_singleton) { - memdelete(time_singleton); - } if (translation_server) { memdelete(translation_server); } @@ -3546,7 +3568,7 @@ bool Main::start() { Error err; Vector<String> paths = get_files_with_extension(gdscript_docs_path, "gd"); - ERR_FAIL_COND_V_MSG(paths.size() == 0, false, "Couldn't find any GDScript files under the given directory: " + gdscript_docs_path); + ERR_FAIL_COND_V_MSG(paths.is_empty(), false, "Couldn't find any GDScript files under the given directory: " + gdscript_docs_path); for (const String &path : paths) { Ref<GDScript> gdscript = ResourceLoader::load(path); @@ -4155,9 +4177,6 @@ void Main::cleanup(bool p_force) { if (input_map) { memdelete(input_map); } - if (time_singleton) { - memdelete(time_singleton); - } if (translation_server) { memdelete(translation_server); } |