1 files changed, 58 insertions, 86 deletions

diff --git a/drivers/gles3/storage/config.cpp b/drivers/gles3/storage/config.cpp
index 1f66401427..30b5919526 100644
--- a/drivers/gles3/storage/config.cpp
+++ b/drivers/gles3/storage/config.cpp
@@ -31,126 +31,98 @@
 #ifdef GLES3_ENABLED
 
 #include "config.h"
+#include "core/config/project_settings.h"
 #include "core/templates/vector.h"
 
 using namespace GLES3;
 
+#define _GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
+
 Config *Config::singleton = nullptr;
 
 Config::Config() {
 	singleton = this;
-	should_orphan = true;
-}
 
-Config::~Config() {
-	singleton = nullptr;
-}
-
-void Config::initialize() {
 	{
-		const GLubyte *extension_string = glGetString(GL_EXTENSIONS);
-
-		Vector<String> exts = String((const char *)extension_string).split(" ");
-
-		for (int i = 0; i < exts.size(); i++) {
-			extensions.insert(exts[i]);
+		GLint max_extensions = 0;
+		glGetIntegerv(GL_NUM_EXTENSIONS, &max_extensions);
+		for (int i = 0; i < max_extensions; i++) {
+			const GLubyte *s = glGetStringi(GL_EXTENSIONS, i);
+			if (!s) {
+				break;
+			}
+			extensions.insert((const char *)s);
 		}
 	}
 
-	keep_original_textures = true; // false
-	shrink_textures_x2 = false;
-	depth_internalformat = GL_DEPTH_COMPONENT;
-	depth_type = GL_UNSIGNED_INT;
-
+	bptc_supported = extensions.has("GL_ARB_texture_compression_bptc") || extensions.has("EXT_texture_compression_bptc");
 #ifdef GLES_OVER_GL
 	float_texture_supported = true;
+	etc2_supported = false;
 	s3tc_supported = true;
-	etc_supported = false;
-	support_npot_repeat_mipmap = true;
-	depth_buffer_internalformat = GL_DEPTH_COMPONENT24;
+	rgtc_supported = true; //RGTC - core since OpenGL version 3.0
 #else
 	float_texture_supported = extensions.has("GL_ARB_texture_float") || extensions.has("GL_OES_texture_float");
-	s3tc_supported = extensions.has("GL_EXT_texture_compression_s3tc") || extensions.has("WEBGL_compressed_texture_s3tc");
-	etc_supported = extensions.has("GL_OES_compressed_ETC1_RGB8_texture") || extensions.has("WEBGL_compressed_texture_etc1");
-	support_npot_repeat_mipmap = extensions.has("GL_OES_texture_npot");
-
-#ifdef JAVASCRIPT_ENABLED
-	// RenderBuffer internal format must be 16 bits in WebGL,
-	// but depth_texture should default to 32 always
-	// if the implementation doesn't support 32, it should just quietly use 16 instead
-	// https://www.khronos.org/registry/webgl/extensions/WEBGL_depth_texture/
-	depth_buffer_internalformat = GL_DEPTH_COMPONENT16;
-	depth_type = GL_UNSIGNED_INT;
+	etc2_supported = true;
+#if defined(ANDROID_ENABLED) || defined(IPHONE_ENABLED)
+	// Some Android devices report support for S3TC but we don't expect that and don't export the textures.
+	// This could be fixed but so few devices support it that it doesn't seem useful (and makes bigger APKs).
+	// For good measure we do the same hack for iOS, just in case.
+	s3tc_supported = false;
 #else
-	// on mobile check for 24 bit depth support for RenderBufferStorage
-	if (extensions.has("GL_OES_depth24")) {
-		depth_buffer_internalformat = _DEPTH_COMPONENT24_OES;
-		depth_type = GL_UNSIGNED_INT;
-	} else {
-		depth_buffer_internalformat = GL_DEPTH_COMPONENT16;
-		depth_type = GL_UNSIGNED_SHORT;
-	}
-#endif
+	s3tc_supported = extensions.has("GL_EXT_texture_compression_dxt1") || extensions.has("GL_EXT_texture_compression_s3tc") || extensions.has("WEBGL_compressed_texture_s3tc");
 #endif
-
-#ifdef GLES_OVER_GL
-	//TODO: causes huge problems with desktop video drivers. Making false for now, needs to be true to render SCREEN_TEXTURE mipmaps
-	render_to_mipmap_supported = false;
-#else
-	//check if mipmaps can be used for SCREEN_TEXTURE and Glow on Mobile and web platforms
-	render_to_mipmap_supported = extensions.has("GL_OES_fbo_render_mipmap") && extensions.has("GL_EXT_texture_lod");
+	rgtc_supported = extensions.has("GL_EXT_texture_compression_rgtc") || extensions.has("GL_ARB_texture_compression_rgtc") || extensions.has("EXT_texture_compression_rgtc");
 #endif
 
 #ifdef GLES_OVER_GL
 	use_rgba_2d_shadows = false;
-	support_depth_texture = true;
-	use_rgba_3d_shadows = false;
-	support_depth_cubemaps = true;
 #else
 	use_rgba_2d_shadows = !(float_texture_supported && extensions.has("GL_EXT_texture_rg"));
-	support_depth_texture = extensions.has("GL_OES_depth_texture") || extensions.has("WEBGL_depth_texture");
-	use_rgba_3d_shadows = !support_depth_texture;
-	support_depth_cubemaps = extensions.has("GL_OES_depth_texture_cube_map");
 #endif
 
-#ifdef GLES_OVER_GL
-	support_32_bits_indices = true;
-#else
-	support_32_bits_indices = extensions.has("GL_OES_element_index_uint");
-#endif
+	glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units);
+	glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_image_units);
+	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
+	glGetIntegerv(GL_MAX_UNIFORM_BLOCK_SIZE, &max_uniform_buffer_size);
 
-#ifdef GLES_OVER_GL
-	support_write_depth = true;
-#elif defined(JAVASCRIPT_ENABLED)
-	support_write_depth = false;
-#else
-	support_write_depth = extensions.has("GL_EXT_frag_depth");
-#endif
+	// the use skeleton software path should be used if either float texture is not supported,
+	// OR max_vertex_texture_image_units is zero
+	use_skeleton_software = (float_texture_supported == false) || (max_vertex_texture_image_units == 0);
 
-	support_half_float_vertices = true;
-//every platform should support this except web, iOS has issues with their support, so add option to disable
-#ifdef JAVASCRIPT_ENABLED
-	support_half_float_vertices = false;
-#endif
-	bool disable_half_float = false; //GLOBAL_GET("rendering/opengl/compatibility/disable_half_float");
-	if (disable_half_float) {
-		support_half_float_vertices = false;
+	support_anisotropic_filter = extensions.has("GL_EXT_texture_filter_anisotropic");
+	if (support_anisotropic_filter) {
+		glGetFloatv(_GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &anisotropic_level);
+		anisotropic_level = MIN(float(1 << int(ProjectSettings::get_singleton()->get("rendering/textures/default_filters/anisotropic_filtering_level"))), anisotropic_level);
 	}
 
-	etc_supported = extensions.has("GL_OES_compressed_ETC1_RGB8_texture");
-	latc_supported = extensions.has("GL_EXT_texture_compression_latc");
-	bptc_supported = extensions.has("GL_ARB_texture_compression_bptc");
-	rgtc_supported = extensions.has("GL_EXT_texture_compression_rgtc") || extensions.has("GL_ARB_texture_compression_rgtc") || extensions.has("EXT_texture_compression_rgtc");
-	bptc_supported = extensions.has("GL_ARB_texture_compression_bptc") || extensions.has("EXT_texture_compression_bptc");
-	srgb_decode_supported = extensions.has("GL_EXT_texture_sRGB_decode");
+	force_vertex_shading = false; //GLOBAL_GET("rendering/quality/shading/force_vertex_shading");
+	use_nearest_mip_filter = GLOBAL_GET("rendering/textures/default_filters/use_nearest_mipmap_filter");
+
+	use_depth_prepass = bool(GLOBAL_GET("rendering/driver/depth_prepass/enable"));
+	if (use_depth_prepass) {
+		String vendors = GLOBAL_GET("rendering/driver/depth_prepass/disable_for_vendors");
+		Vector<String> vendor_match = vendors.split(",");
+		String renderer = (const char *)glGetString(GL_RENDERER);
+		for (int i = 0; i < vendor_match.size(); i++) {
+			String v = vendor_match[i].strip_edges();
+			if (v == String()) {
+				continue;
+			}
+
+			if (renderer.findn(v) != -1) {
+				use_depth_prepass = false;
+			}
+		}
+	}
 
-	glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &max_vertex_texture_image_units);
-	glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_texture_image_units);
-	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
+	max_renderable_elements = GLOBAL_GET("rendering/limits/opengl/max_renderable_elements");
+	max_renderable_lights = GLOBAL_GET("rendering/limits/opengl/max_renderable_lights");
+	max_lights_per_object = GLOBAL_GET("rendering/limits/opengl/max_lights_per_object");
+}
 
-	force_vertex_shading = false; //GLOBAL_GET("rendering/quality/shading/force_vertex_shading");
-	use_fast_texture_filter = false; //GLOBAL_GET("rendering/quality/filters/use_nearest_mipmap_filter");
-	// should_orphan = GLOBAL_GET("rendering/options/api_usage_legacy/orphan_buffers");
+Config::~Config() {
+	singleton = nullptr;
 }
 
 #endif // GLES3_ENABLED