commit a1539a9b19217b1df9c33d63a7b0fc3886988a23
author Jean-François Thibert <jfthibert@google.com> Thu Jun 13 13:28:59 2024 -0400
committer Jean-Francois Thibert <jfthibert@google.com> Thu Jun 13 13:59:27 2024 -0400
tree 7168f838e0b1fc9fbe79c31ece23773689957af0
parent c9178dcb3b9673a5a141e997b823b0953282d9e7

Add depth formats support to import/export

BUG=347022601
TEST=Ran app that export/import depth through AHB with cf

Change-Id: I22a93e9cf4df74337c4d1624a98223c5446a0deb

host/virtio-gpu-gfxstream-renderer.cpp

diff --git a/host/virtio-gpu-gfxstream-renderer.cpp b/host/virtio-gpu-gfxstream-renderer.cpp
index cf058d4..19d911a 100644
--- a/host/virtio-gpu-gfxstream-renderer.cpp
+++ b/host/virtio-gpu-gfxstream-renderer.cpp
@@ -337,6 +337,11 @@
 const uint32_t kGlLuminanceAlpha = 0x190a;
 const uint32_t kGlUnsignedByte = 0x1401;
 const uint32_t kGlUnsignedShort565 = 0x8363;
+const uint32_t kGlDepth16 = 0x81A5;
+const uint32_t kGlDepth24 = 0x81A6;
+const uint32_t kGlDepth24Stencil8 = 0x88F0;
+const uint32_t kGlDepth32f = 0x8CAC;
+const uint32_t kGlDepth32fStencil78 = 0x8CAD;
 
 constexpr uint32_t kFwkFormatGlCompat = 0;
 constexpr uint32_t kFwkFormatYV12 = 1;
@@ -356,6 +361,11 @@
         case VIRGL_FORMAT_R16G16B16A16_FLOAT:
         case VIRGL_FORMAT_R8G8_UNORM:
         case VIRGL_FORMAT_R10G10B10A2_UNORM:
+        case VIRGL_FORMAT_Z16_UNORM:
+        case VIRGL_FORMAT_Z24X8_UNORM:
+        case VIRGL_FORMAT_Z24_UNORM_S8_UINT:
+        case VIRGL_FORMAT_Z32_FLOAT:
+        case VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT:
             return false;
         case VIRGL_FORMAT_NV12:
         case VIRGL_FORMAT_P010:
@@ -392,6 +402,16 @@
             return kGlRgba;
         case VIRGL_FORMAT_R10G10B10A2_UNORM:
             return kGlRgba1010102;
+        case VIRGL_FORMAT_Z16_UNORM:
+            return kGlDepth16;
+        case VIRGL_FORMAT_Z24X8_UNORM:
+            return kGlDepth24;
+        case VIRGL_FORMAT_Z24_UNORM_S8_UINT:
+            return kGlDepth24Stencil8;
+        case VIRGL_FORMAT_Z32_FLOAT:
+            return kGlDepth32f;
+        case VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT:
+            return  kGlDepth32fStencil78;
         default:
             return kGlRgba;
     }
@@ -415,6 +435,11 @@
         case VIRGL_FORMAT_R8G8B8A8_UNORM:
         case VIRGL_FORMAT_B5G6R5_UNORM:
         case VIRGL_FORMAT_R10G10B10A2_UNORM:
+        case VIRGL_FORMAT_Z16_UNORM:
+        case VIRGL_FORMAT_Z24X8_UNORM:
+        case VIRGL_FORMAT_Z24_UNORM_S8_UINT:
+        case VIRGL_FORMAT_Z32_FLOAT:
+        case VIRGL_FORMAT_Z32_FLOAT_S8X24_UINT:
         default:  // kFwkFormatGlCompat: No extra conversions needed
             return kFwkFormatGlCompat;
     }