Revert "gfxstream: introduce GFXSTREAM_ENABLE_HOST_GLES compiler flag"
This reverts commit 4675a9d4ef76b83dea5367079c8415102d3781da.
Reason for revert: I suppose it breaks MacOS
Change-Id: I91bef5c2fa0e8726b6e77e6678540b808ad26316
diff --git a/host/RenderThread.cpp b/host/RenderThread.cpp
index d1d34ea..abe4fcc 100644
--- a/host/RenderThread.cpp
+++ b/host/RenderThread.cpp
@@ -19,24 +19,21 @@
#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/Metrics.h"
-#include "aemu/base/files/StreamSerializing.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/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"
@@ -273,13 +270,12 @@
//
// 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);
@@ -527,7 +523,6 @@
FrameBuffer::getFB()->lockContextStructureRead();
}
-#if GFXSTREAM_ENABLE_HOST_GLES
if (tInfo.m_glInfo) {
{
last = tInfo.m_glInfo->m_glDec.decode(
@@ -552,14 +547,12 @@
}
}
}
-#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);
@@ -568,7 +561,6 @@
progress = true;
}
}
-#endif
//
// try to process some of the command buffer using the Magma
@@ -597,11 +589,9 @@
fclose(dumpFP);
}
-#if GFXSTREAM_ENABLE_HOST_GLES
if (tInfo.m_glInfo) {
FrameBuffer::getFB()->drainGlRenderThreadResources();
}
-#endif
setFinished();
