浏览代码

Merge pull request #32255 from lawnjelly/android-s3tc2

Rémi Verschelde 3 年之前
父节点
当前提交
ae08afc43c
共有 1 个文件被更改,包括 7 次插入0 次删除
  1. 7 0
      drivers/gles2/rasterizer_storage_gles2.cpp

+ 7 - 0
drivers/gles2/rasterizer_storage_gles2.cpp

@@ -6184,6 +6184,13 @@ void RasterizerStorageGLES2::initialize() {
 	config.pvrtc_supported = config.extensions.has("GL_IMG_texture_compression_pvrtc") || config.extensions.has("WEBGL_compressed_texture_pvrtc");
 	config.support_npot_repeat_mipmap = config.extensions.has("GL_OES_texture_npot");
 
+	// If the desktop build is using S3TC, and you export / run from the IDE for android, if the device supports
+	// S3TC it will crash trying to load these textures, as they are not exported in the APK. This is a simple way
+	// to prevent Android devices trying to load S3TC, by faking lack of hardware support.
+#if defined(ANDROID_ENABLED) || defined(IPHONE_ENABLED)
+	config.s3tc_supported = false;
+#endif
+
 #ifdef JAVASCRIPT_ENABLED
 	// RenderBuffer internal format must be 16 bits in WebGL,
 	// but depth_texture should default to 32 always