Merge branch 'master' into 12.0-development

src/modules/event/sdl/Event.cpp

@@ -398,7 +398,7 @@ Message *Event::convert(const SDL_Event &e)
 				txt = "unknown";
 
 			vargs.emplace_back((double)(e.display.display + 1));
-			vargs.emplace_back(txt);
+			vargs.emplace_back(txt, strlen(txt));
 
 			msg = new Message("displayrotated", vargs);
 		}

src/modules/graphics/opengl/OpenGL.cpp

@@ -1942,7 +1942,7 @@ OpenGL::TextureFormat OpenGL::convertPixelFormat(PixelFormat pixelformat, bool r
 		break;
 
 	case PIXELFORMAT_DXT1_UNORM:
-		f.internalformat = isSRGB ? GL_COMPRESSED_SRGB_S3TC_DXT1_EXT : GL_COMPRESSED_RGB_S3TC_DXT1_EXT;
+		f.internalformat = isSRGB ? GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT : GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
 		break;
 	case PIXELFORMAT_DXT3_UNORM:
 		f.internalformat = isSRGB ? GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT : GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;