Merge branch 'main' into 12.0-development

.hgignore

@@ -1,58 +0,0 @@
-glob:extra/reshax/Release/
-glob:extra/reshax/Debug/
-glob:extra/reshax/resources.h
-glob:extra/reshax/resources.cpp
-glob:*.obj
-glob:*.o
-glob:*.dirstamp
-glob:*.m4
-glob:*.Po
-glob:*.lo
-glob:*.Plo
-glob:*.dll
-glob:*.user
-glob:*.suo
-glob:*/Release*
-glob:*/Debug*
-glob:*.lib
-glob:*.ncb
-glob:*.exe
-glob:*.bat
-glob:platform/xcode/Build
-glob:platform/xcode/DerivedData
-glob:platform/xcode/ios/include
-glob:platform/xcode/ios/libraries
-glob:platform/xcode/ios/luajit-git
-glob:*xcuserdata*
-glob:*.DS_Store
-glob:*.dylib
-glob:*.dmg*
-glob:demos
-glob:*.orig
-glob:.*.swp
-glob:autom4te.cache/
-glob:src/.libs/
-glob:*~
-glob:Makefile*
-glob:config*
-glob:libtool
-glob:platform/unix/ar-lib
-glob:platform/unix/compile
-glob:platform/unix/config.guess
-glob:platform/unix/config.sub
-glob:platform/unix/debian/changelog
-glob:platform/unix/debian/control
-glob:platform/unix/debian/rules
-glob:platform/unix/depcomp
-glob:platform/unix/install-sh
-glob:platform/unix/love.desktop
-glob:platform/unix/ltmain.sh
-glob:platform/unix/missing
-glob:.lineno
-glob:*.la
-glob:*.Tpo
-glob:*.rej
-glob:*/.deps
-glob:stamp-h1
-glob:src/love
-glob:src/tags

.hgtags

@@ -1,17 +0,0 @@
-301312c82b00b1b70ceba066e1fab523be38b60a 0.6.0
-1c05df814086e1c3486423381b4bf52a3b5d4f87 0.6.1
-db7cd0682883ed357adef013a326bbb26de28c98 0.6.2
-9240be0fe0ea1070bc604954ab2e81320e278ad9 0.7.0
-18d79c306466d188919c238d23e50ea705b07c03 0.7.1
-bcca82b60d0f5cd724edbe4ed65db18ab95d4691 0.7.2
-e0f98d53debb62347c6433ca0534a0f77f15f76f 0.8.0
-38c00c788bcb03bda2ad40efebcdfe7a6be85b4a 0.9.0
-8b113c345e97e7bb7e963e5d67451abdfb05cfde 0.9.1
-a5e405cdf14d030b71d09a105086797942ae91a9 0.9.2
-14717f0fb5d96d380c10fe6f41b74b7652c7d836 0.10.0
-3cb3559eebb89803c0b7fa83d51d8e48a2b20b7a 0.10.1
-afc69c4f714534c64e6f8c8660b724b5b736d7f3 0.10.2
-bf8892ecbd07a10453c4bb36aa538b90a2830d2b 11.0
-0ab246b5045d2e697a516fcc0f8b12496a2d5c78 11.1
-55dc225ee239c15eff5751d35ca40252588abd92 11.2
-8c6f6a0ca1f0d880c6aa73aaeff0bc510370f737 11.3

src/modules/graphics/opengl/OpenGL.cpp

@@ -2091,7 +2091,14 @@ OpenGL::TextureFormat OpenGL::convertPixelFormat(PixelFormat pixelformat, bool r
 
 	if (!isPixelFormatCompressed(pixelformat))
 	{
-		if (GLAD_ES_VERSION_2_0 && !(GLAD_ES_VERSION_3_0 && pixelformat == PIXELFORMAT_LA8_UNORM)
+		// glTexImage in OpenGL ES 2 only accepts internal format enums that
+		// match the external format. GLES3 doesn't have that restriction - 
+		// except for GL_LUMINANCE_ALPHA which doesn't have a sized version in
+		// ES3. However we always use RG8 for PIXELFORMAT_LA8 on GLES3 so it
+		// doesn't matter there.
+		// Also note that GLES2+extension sRGB format enums are different from
+		// desktop GL and GLES3+ (this is handled above).
+		if (GLAD_ES_VERSION_2_0 && !GLAD_ES_VERSION_3_0
 			&& !renderbuffer && !isTexStorageSupported())
 		{
 			f.internalformat = f.externalformat;