From: Eric Anholt <eric@anholt.net>
Date: Wed, 18 Sep 2019 21:27:51 +0000 (-0700)
Subject: mesa: Add format/type matching for DEPTH/UINT_24_8.
X-Git-Url: https://git.libre-soc.org/?p=mesa.git;a=commitdiff_plain;h=4f4fc7535787e4a1006051611f573dc6d5eae741

mesa: Add format/type matching for DEPTH/UINT_24_8.

We had missed this case where GLES3 allows glReadPixels(DEPTH, UINT_24_8),
and just got lucky by the readpixels path never asking for the matching
format from this function.

Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 3ab06456e8b..f2af50cd855 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -3738,6 +3738,8 @@ _mesa_format_from_format_and_type(GLenum format, GLenum type)
    case GL_UNSIGNED_INT_24_8:
       if (format == GL_DEPTH_STENCIL)
          return MESA_FORMAT_S8_UINT_Z24_UNORM;
+      else if (format == GL_DEPTH_COMPONENT)
+         return MESA_FORMAT_X8_UINT_Z24_UNORM;
       break;
    case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
       if (format == GL_DEPTH_STENCIL)