commit 95b30dc862a7ddefa0c36bfc8f7e65a900f0ff81
author Gurchetan Singh <gurchetansingh@google.com> Thu Jan 18 18:31:15 2024 -0800
committer Gurchetan Singh <gurchetansingh@google.com> Thu Jan 18 18:34:08 2024 -0800
tree 1297dbb6b16dedc963fbe750bcb8af89259e9d3a
parent 813c75c93b080ecc6dc00cae21c2ec34c01982fc

Reland "gfxstream: introduce GFXSTREAM_ENABLE_HOST_GLES compiler flag"

Same as before, but added extra GFXSTREAM_ENABLE_HOST_GLES
to keep MacOS builders happy.

Change-Id: I333503ecb6e67840326ce248428fa097eb152e92

host/RenderThread.cpp

diff --git a/host/RenderThread.cpp b/host/RenderThread.cpp
index abe4fcc..d1d34ea 100644
--- a/host/RenderThread.cpp
+++ b/host/RenderThread.cpp
@@ -19,21 +19,24 @@
 #include "FrameBuffer.h"
 #include "ReadBuffer.h"
 #include "RenderChannelImpl.h"
-#include "RenderControl.h"
 #include "RenderThreadInfo.h"
 #include "RingStream.h"
 #include "VkDecoderContext.h"
-#include "apigen-codec-common/ChecksumCalculatorThreadInfo.h"
 #include "aemu/base/HealthMonitor.h"
-#include "aemu/base/synchronization/Lock.h"
-#include "aemu/base/synchronization/MessageChannel.h"
 #include "aemu/base/Metrics.h"
 #include "aemu/base/files/StreamSerializing.h"
+#include "aemu/base/synchronization/Lock.h"
+#include "aemu/base/synchronization/MessageChannel.h"
 #include "aemu/base/system/System.h"
+#include "apigen-codec-common/ChecksumCalculatorThreadInfo.h"
 #include "host-common/feature_control.h"
 #include "host-common/logging.h"
 #include "vulkan/VkCommonOperations.h"
 
+#if GFXSTREAM_ENABLE_HOST_GLES
+#include "RenderControl.h"
+#endif
+
 #define EMUGL_DEBUG_LEVEL 0
 #include "host-common/debug.h"
 
@@ -270,12 +273,13 @@
 
     //
     // initialize decoders
-    //
+#if GFXSTREAM_ENABLE_HOST_GLES
     if (!feature_is_enabled(kFeature_GuestUsesAngle)) {
         tInfo.initGl();
     }
 
     initRenderControlContext(&tInfo.m_rcDec);
+#endif
 
     if (!mChannel && !mRingStream) {
         GL_LOG("Exited a loader RenderThread @%p", this);
@@ -523,6 +527,7 @@
                 FrameBuffer::getFB()->lockContextStructureRead();
             }
 
+#if GFXSTREAM_ENABLE_HOST_GLES
             if (tInfo.m_glInfo) {
                 {
                     last = tInfo.m_glInfo->m_glDec.decode(
@@ -547,12 +552,14 @@
                     }
                 }
             }
+#endif
 
             FrameBuffer::getFB()->unlockContextStructureRead();
             //
             // try to process some of the command buffer using the
             // renderControl decoder
             //
+#if GFXSTREAM_ENABLE_HOST_GLES
             {
                 last = tInfo.m_rcDec.decode(readBuf.buf(), readBuf.validData(),
                                             ioStream, &checksumCalc);
@@ -561,6 +568,7 @@
                     progress = true;
                 }
             }
+#endif
 
             //
             // try to process some of the command buffer using the Magma
@@ -589,9 +597,11 @@
         fclose(dumpFP);
     }
 
+#if GFXSTREAM_ENABLE_HOST_GLES
     if (tInfo.m_glInfo) {
         FrameBuffer::getFB()->drainGlRenderThreadResources();
     }
+#endif
 
     setFinished();