gfxstream: fix VERBOSE logging change
Breaks meson build. Two issues:
1) It requires a new API from AEMU base, which for the
meson build doesn't work since it likes to keep working
with AEMU v0.1.2
2) The logging facade itself is too QEMU 2.12 centric. Upstream
QEMU and crosvm's logging handlers are hooked into
stream_renderer_{error, warn, info}, example:
https://github.com/qemu/qemu/blob/master/hw/display/virtio-gpu-rutabaga.c#L933
So VERBOSE shouldn't be AEMU anyways if you want a generic
host-side logging facade.
BUG=317816825
TEST=meson build
Change-Id: I659e10d8b2920b6478043df0ba5fff80ada05b1d
diff --git a/host/RendererImpl.cpp b/host/RendererImpl.cpp
index a1b49ac..aaec95e 100644
--- a/host/RendererImpl.cpp
+++ b/host/RendererImpl.cpp
@@ -126,9 +126,11 @@
bool RendererImpl::initialize(int width, int height, gfxstream::host::FeatureSet features,
bool useSubWindow, bool egl2egl) {
+#ifdef CONFIG_AEMU
if (android::base::getEnvironmentVariable("ANDROID_EMUGL_VERBOSE") == "1") {
set_gfxstream_enable_verbose_logs();
}
+#endif
if (mRenderWindow) {
return false;
diff --git a/host/vulkan/VkCommonOperations.cpp b/host/vulkan/VkCommonOperations.cpp
index bf3db56..10f3526 100644
--- a/host/vulkan/VkCommonOperations.cpp
+++ b/host/vulkan/VkCommonOperations.cpp
@@ -65,6 +65,12 @@
using emugl::ABORT_REASON_OTHER;
using emugl::FatalError;
+#ifndef VERBOSE
+#define VERBOSE(fmt, ...) \
+ if (android::base::isVerboseLogging()) \
+ fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, ##__VA_ARGS__);
+#endif
+
constexpr size_t kPageBits = 12;
constexpr size_t kPageSize = 1u << kPageBits;
diff --git a/host/vulkan/VkDecoderGlobalState.cpp b/host/vulkan/VkDecoderGlobalState.cpp
index 1094dee..57dfd0b 100644
--- a/host/vulkan/VkDecoderGlobalState.cpp
+++ b/host/vulkan/VkDecoderGlobalState.cpp
@@ -71,6 +71,12 @@
#include <vulkan/vulkan_beta.h> // for MoltenVK portability extensions
#endif
+#ifndef VERBOSE
+#define VERBOSE(fmt, ...) \
+ if (android::base::isVerboseLogging()) \
+ fprintf(stderr, "%s:%d " fmt "\n", __func__, __LINE__, ##__VA_ARGS__);
+#endif
+
#include <climits>
namespace gfxstream {
