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

Merge pull request #72816 from m4gr3d/downgrade_vulkan_warning 

Downgrade the vulkan abort logic to a warning
This commit is contained in:
Rémi Verschelde 2023-02-08 11:24:48 +01:00 committed by GitHub
parent 8843d9ad34 9d83e807e7
commit c4fb119f03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/android/java/editor/src/main/res/values/dimens.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<dimen name="editor_default_window_height">600dp</dimen> <dimen name="editor_default_window_height">600dp</dimen>
<dimen name="editor_default_window_width">800dp</dimen> <dimen name="editor_default_window_width">1024dp</dimen>
</resources> </resources>

2
platform/android/java/lib/res/values/strings.xml
View File

@ -14,7 +14,7 @@
<string name="text_button_cancel_verify">Cancel Verification</string> <string name="text_button_cancel_verify">Cancel Verification</string>
<string name="text_error_title">Error!</string> <string name="text_error_title">Error!</string>
<string name="error_engine_setup_message">Unable to setup the Godot Engine! Aborting…</string> <string name="error_engine_setup_message">Unable to setup the Godot Engine! Aborting…</string>
<string name="error_missing_vulkan_requirements_message">This device does not meet the requirements for Vulkan support! Aborting…</string> <string name="error_missing_vulkan_requirements_message">Warning - this device does not meet the requirements for Vulkan support</string>
<!-- APK Expansion Strings --> <!-- APK Expansion Strings -->

5
platform/android/java/lib/src/org/godotengine/godot/Godot.java
View File

@ -83,6 +83,7 @@ import android.widget.Button;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.CallSuper; import androidx.annotation.CallSuper;
import androidx.annotation.Keep; import androidx.annotation.Keep;
@ -277,9 +278,7 @@ public class Godot extends Fragment implements SensorEventListener, IDownloaderC
if (usesVulkan()) { if (usesVulkan()) {
if (!meetsVulkanRequirements(activity.getPackageManager())) { if (!meetsVulkanRequirements(activity.getPackageManager())) {
Log.e(TAG, "Missing requirements for vulkan support! Aborting..."); Log.w(TAG, "Missing requirements for vulkan support!");
alert(R.string.error_missing_vulkan_requirements_message, R.string.text_error_title, this::forceQuit);
return false;
} }
mRenderView = new GodotVulkanRenderView(activity, this); mRenderView = new GodotVulkanRenderView(activity, this);
} else { } else {