Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

Merge pull request #65541 from clayjohn/renderer-setting

Browse source 
Split rendering driver project setting into renderer_name and rendering_driver
This commit is contained in:
Rémi Verschelde 2022-09-20 09:43:59 +02:00
commit 7da532275b
43 changed files with 411 additions and 245 deletions
Download patch file Download diff file Expand all files Collapse all files

9
platform/android/export/export_plugin.cpp
View file

@ -1669,14 +1669,7 @@ Vector<String> EditorExportPlatformAndroid::get_enabled_abis(const Ref<EditorExp
}
void EditorExportPlatformAndroid::get_preset_features(const Ref<EditorExportPreset> &p_preset, List<String> *r_features) const {
String driver = ProjectSettings::get_singleton()->get("rendering/driver/driver_name");
if (driver == "opengl3") {
r_features->push_back("etc");
}
// FIXME: Review what texture formats are used for Vulkan.
if (driver == "vulkan") {
r_features->push_back("etc2");
}
r_features->push_back("etc2");
Vector<String> abis = get_enabled_abis(p_preset);
for (int i = 0; i < abis.size(); ++i) {

4
platform/android/export/gradle_export_util.cpp
View file

@ -189,9 +189,7 @@ String bool_to_string(bool v) {
}
String _get_gles_tag() {
bool min_gles3 = ProjectSettings::get_singleton()->get("rendering/driver/driver_name") == "GLES3" &&
!ProjectSettings::get_singleton()->get("rendering/driver/fallback_to_gles2");
return min_gles3 ? " <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n" : "";
return " <uses-feature android:glEsVersion=\"0x00030000\" android:required=\"true\" />\n";
}
String _get_screen_sizes_tag(const Ref<EditorExportPreset> &p_preset) {

8
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View file

@ -274,11 +274,11 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
return false;
}
final String videoDriver = GodotLib.getGlobal("rendering/driver/driver_name");
if (videoDriver.equals("vulkan")) {
mRenderView = new GodotVulkanRenderView(activity, this);
} else {
final String renderer = GodotLib.getGlobal("rendering/renderer/rendering_method");
if (renderer.equals("gl_compatibility")) {
mRenderView = new GodotGLRenderView(activity, this, xrMode, use_debug_opengl);
} else {
mRenderView = new GodotVulkanRenderView(activity, this);
}
View view = mRenderView.getView();