Windows UWP: Enable color emoji rendering through DirectWrite

hrydgard · Aug 6, 2023 · ab685be · ab685be
1 parent 5533d5e
commit ab685be
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/Common/Render/Text/draw_text_android.cpp b/Common/Render/Text/draw_text_android.cpp
@@ -250,8 +250,6 @@ void TextDrawerAndroid::DrawString(DrawBuffer &target, const char *str, float x,
 	if (text.empty())
 		return;
 
-	bool emoji = AnyEmojiInString(text.c_str(), text.size());
-
 	CacheKey key{ std::string(str), fontHash_ };
 	target.Flush(true);
 
@@ -263,6 +261,7 @@ void TextDrawerAndroid::DrawString(DrawBuffer &target, const char *str, float x,
 		entry->lastUsedFrame = frameCount_;
 	} else {
 		DataFormat texFormat = use4444Format_ ? Draw::DataFormat::R4G4B4A4_UNORM_PACK16 : Draw::DataFormat::R8_UNORM;
+		bool emoji = AnyEmojiInString(text.c_str(), text.size());
 		if (emoji) {
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;
 		}

diff --git a/Common/Render/Text/draw_text_uwp.cpp b/Common/Render/Text/draw_text_uwp.cpp
@@ -380,7 +380,7 @@ void TextDrawerUWP::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStrin
 
 	m_d2dContext->BeginDraw();
 	m_d2dContext->Clear();
-	m_d2dContext->DrawTextLayout(D2D1::Point2F(0.0f, 0.0f), layout, m_d2dWhiteBrush);
+	m_d2dContext->DrawTextLayout(D2D1::Point2F(0.0f, 0.0f), layout, m_d2dWhiteBrush, texFormat == Draw::DataFormat::R8G8B8A8_UNORM ? D2D1_DRAW_TEXT_OPTIONS_ENABLE_COLOR_FONT : D2D1_DRAW_TEXT_OPTIONS_NONE);
 	m_d2dContext->EndDraw();
 
 	layout->Release();
@@ -395,11 +395,15 @@ void TextDrawerUWP::DrawStringBitmap(std::vector<uint8_t> &bitmapData, TextStrin
 	// because we need white. Well, we could using swizzle, but not all our backends support that.
 	if (texFormat == Draw::DataFormat::R8G8B8A8_UNORM || texFormat == Draw::DataFormat::B8G8R8A8_UNORM) {
 		bitmapData.resize(entry.bmWidth * entry.bmHeight * sizeof(uint32_t));
+		bool swap = texFormat == Draw::DataFormat::R8G8B8A8_UNORM;
 		uint32_t *bitmapData32 = (uint32_t *)&bitmapData[0];
 		for (int y = 0; y < entry.bmHeight; y++) {
+			uint32_t *bmpLine = (uint32_t *)&map.bits[map.pitch * y];
 			for (int x = 0; x < entry.bmWidth; x++) {
-				uint8_t bAlpha = (uint8_t)(map.bits[map.pitch * y + x * 4] & 0xff);
-				bitmapData32[entry.bmWidth * y + x] = (bAlpha << 24) | 0x00ffffff;
+				uint32_t v = bmpLine[x];
+				if (swap)
+					v = (v & 0xFF00FF00) | ((v >> 16) & 0xFF) | ((v << 16) & 0xFF0000);
+				bitmapData32[entry.bmWidth * y + x] = v;
 			}
 		}
 	} else if (texFormat == Draw::DataFormat::B4G4R4A4_UNORM_PACK16 || texFormat == Draw::DataFormat::R4G4B4A4_UNORM_PACK16) {
@@ -451,6 +455,7 @@ void TextDrawerUWP::DrawString(DrawBuffer &target, const char *str, float x, flo
 		entry->lastUsedFrame = frameCount_;
 	} else {
 		DataFormat texFormat;
+
 		// For our purposes these are equivalent, so just choose the supported one. D3D can emulate them.
 		if (draw_->GetDataFormatSupport(Draw::DataFormat::A4R4G4B4_UNORM_PACK16) & FMT_TEXTURE)
 			texFormat = Draw::DataFormat::A4R4G4B4_UNORM_PACK16;
@@ -459,6 +464,10 @@ void TextDrawerUWP::DrawString(DrawBuffer &target, const char *str, float x, flo
 		else
 			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;
 
+		bool emoji = AnyEmojiInString(key.text.c_str(), key.text.size());
+		if (emoji)
+			texFormat = Draw::DataFormat::R8G8B8A8_UNORM;
+
 		entry = new TextStringEntry();
 
 		// Convert the bitmap to a Thin3D compatible array of 16-bit pixels. Can't use a single channel format

diff --git a/UI/MiscScreens.cpp b/UI/MiscScreens.cpp
@@ -795,7 +795,7 @@ void LogoScreen::render() {
 	int ppsspp_org_y = bounds.h / 2 + 130;
 	dc.DrawText("www.ppsspp.org", bounds.centerX(), ppsspp_org_y, textColor, ALIGN_CENTER);
 
-#if !PPSSPP_PLATFORM(UWP)
+#if !PPSSPP_PLATFORM(UWP) || defined(_DEBUG)
 	// Draw the graphics API, except on UWP where it's always D3D11
 	std::string apiName = screenManager()->getDrawContext()->GetInfoString(InfoField::APINAME);
 #ifdef _DEBUG