commit 71de1b6552849d9f69b533ae8019222932683916
author John Reck <jreck@google.com> Fri Jan 12 17:47:53 2024 -0500
committer John Reck <jreck@google.com> Tue Jan 16 13:01:05 2024 -0500
tree 1f4dce6cdd2c3dc817608dae237b26031d662969
parent a35c8f8305980ae5a89b09e81c0013e7c4350f6f

Fix wrong constant for R8 GL upload

GL_RED + GL_UNSIGNED_BYTE is the pairing for R8 for
glTex(Sub)Image2D, not GL_R8

Test: adb shell setprop debug.hwui.renderer skiagl && atest android.graphics.cts.GainmapTest
Fixes: 319734219
Change-Id: I73874e22f8958e4aaa52963546674ec9946f8013

libs/hwui/HardwareBitmapUploader.cpp

diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp
index 16de21d..71f7926 100644
--- a/libs/hwui/HardwareBitmapUploader.cpp
+++ b/libs/hwui/HardwareBitmapUploader.cpp
@@ -379,7 +379,7 @@
         case kAlpha_8_SkColorType:
             formatInfo.isSupported = HardwareBitmapUploader::hasAlpha8Support();
             formatInfo.bufferFormat = AHARDWAREBUFFER_FORMAT_R8_UNORM;
-            formatInfo.format = GL_R8;
+            formatInfo.format = GL_RED;
             formatInfo.type = GL_UNSIGNED_BYTE;
             formatInfo.vkFormat = VK_FORMAT_R8_UNORM;
             break;