commit 290c9ff7ba901db6ba6b6faffdd80fc77ea12986
author Jason Macnak <natsu@google.com> Tue Jul 09 08:27:30 2024 -0700
committer Jason Macnak <natsu@google.com> Tue Jul 09 08:30:16 2024 -0700
tree ee356eb1bbe841c7f2602e776ee60c711b8c9777
parent 160f0b88dba099ff5876c4c216990906740f39d2

Disable propogating linear bind attribute on Android

... by hiding behind a build time flag.

Bug: b/347288539
Test: cts -m CtsGraphicsTestCases
          -t android.graphics.cts.MediaVulkanGpuTest#testMediaImportAndRendering
Change-Id: I65d4df5ca8f725c0528c0cc3cff13860157794f4

host/meson.build

diff --git a/host/meson.build b/host/meson.build
index f807f3e..14b1c28 100644
--- a/host/meson.build
+++ b/host/meson.build
@@ -6,6 +6,7 @@
 #===============#
 gfxstream_host_args = [
   '-D_FILE_OFFSET_BITS=64',
+  '-DGFXSTREAM_ENABLE_GUEST_VIRTIO_RESOURCE_TILING_CONTROL=1',
   '-Wno-unused-parameter',
   '-Wno-unused-function',
   '-Wno-unused-variable',

host/virtio-gpu-gfxstream-renderer.cpp

diff --git a/host/virtio-gpu-gfxstream-renderer.cpp b/host/virtio-gpu-gfxstream-renderer.cpp
index 5ff4904..1a43ac1 100644
--- a/host/virtio-gpu-gfxstream-renderer.cpp
+++ b/host/virtio-gpu-gfxstream-renderer.cpp
@@ -1185,7 +1185,13 @@
 
         const uint32_t glformat = virgl_format_to_gl(args->format);
         const uint32_t fwkformat = virgl_format_to_fwk_format(args->format);
-        const bool linear = !!(args->bind & VIRGL_BIND_LINEAR);
+
+        const bool linear =
+#ifdef GFXSTREAM_ENABLE_GUEST_VIRTIO_RESOURCE_TILING_CONTROL
+            !!(args->bind & VIRGL_BIND_LINEAR);
+#else
+            false;
+#endif
         gfxstream::FrameBuffer::getFB()->createColorBufferWithHandle(
             args->width, args->height, glformat, (gfxstream::FrameworkFormat)fwkformat,
             args->handle, linear);