From a6dc18e874cd012134663d6d39950486dbd9e12d Mon Sep 17 00:00:00 2001 From: Nataraj Deshpande Date: Wed, 13 May 2020 14:32:13 -0700 Subject: [PATCH] dri_util: Update internal_format to GL_RGB8 for MESA_FORMAT_R8G8B8X8_UNORM MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The commit helps to resolve GL_INVALID_OPERATION error returned during CTS test when Android format RGBX8888 fallback to RGBA8888 and then set color with glTexSubImage2D(format=GL_RGB). Fixes android.hardware.nativehardware.cts.AHardwareBufferNativeTests: #SingleLayer_ColorTest_GpuSampledImageCanBeSampled_R8G8B8X8_UNORM Cc: Fixes: bf576772ab4d ("dri_util: add driImageFormatToSizedInternalGLFormat function") Signed-off-by: Nataraj Deshpande Reviewed-by: Marek Olšák Reviewed-by: Tapani Pälli Part-of: (cherry picked from commit 02a1f95386b43bf46cd1c8297d0955242f554fa2) --- .pick_status.json | 2 +- src/mesa/drivers/dri/common/dri_util.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index d7ed60c9a28..1d1965aa32d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2227,7 +2227,7 @@ "description": "dri_util: Update internal_format to GL_RGB8 for MESA_FORMAT_R8G8B8X8_UNORM", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "bf576772ab4d9e76dae716640bed6de879f19567" }, diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index bfa3d35fd81..e90179c7f2e 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -935,7 +935,7 @@ static const struct { { .image_format = __DRI_IMAGE_FORMAT_XBGR8888, .mesa_format = MESA_FORMAT_R8G8B8X8_UNORM, - .internal_format = GL_RGBA8, + .internal_format = GL_RGB8, }, { .image_format = __DRI_IMAGE_FORMAT_R8,