diff options
| author | Nataraj Deshpande <nataraj.deshpande@intel.com> | 2020-05-13 14:32:13 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-05-27 21:54:15 +0200 |
| commit | a6dc18e874cd012134663d6d39950486dbd9e12d (patch) | |
| tree | dd2c0e64ad8f3bd443ed7d5f0256c7b270bd6463 | |
| parent | 2303be5ff1b7a6d75af6a1d1513dae9c051be29b (diff) | |
dri_util: Update internal_format to GL_RGB8 for MESA_FORMAT_R8G8B8X8_UNORM
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: <mesa-stable@lists.freedesktop.org>
Fixes: bf576772ab4d ("dri_util: add driImageFormatToSizedInternalGLFormat function")
Signed-off-by: Nataraj Deshpande <nataraj.deshpande@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5034>
(cherry picked from commit 02a1f95386b43bf46cd1c8297d0955242f554fa2)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | 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, |