From 71de1b6552849d9f69b533ae8019222932683916 Mon Sep 17 00:00:00 2001 From: John Reck Date: Fri, 12 Jan 2024 17:47:53 -0500 Subject: 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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'libs/hwui/HardwareBitmapUploader.cpp') diff --git a/libs/hwui/HardwareBitmapUploader.cpp b/libs/hwui/HardwareBitmapUploader.cpp index 16de21def0e3..71f7926930fc 100644 --- a/libs/hwui/HardwareBitmapUploader.cpp +++ b/libs/hwui/HardwareBitmapUploader.cpp @@ -379,7 +379,7 @@ static FormatInfo determineFormat(const SkBitmap& skBitmap, bool usingGL) { 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; -- cgit v1.2.3-59-g8ed1b