Rename gfx_logger to gfxLogger in non-generated code
Change-Id: I0075eb514ca8f84d4fc0af6957cc83ff872bfee7
diff --git a/stream-servers/FrameBuffer.cpp b/stream-servers/FrameBuffer.cpp
index 53acab8..659b60a 100644
--- a/stream-servers/FrameBuffer.cpp
+++ b/stream-servers/FrameBuffer.cpp
@@ -57,7 +57,6 @@
using android::base::WorkerProcessingResult;
using emugl::ABORT_REASON_OTHER;
using emugl::FatalError;
-
using emugl::GfxApiLogger;
namespace {
diff --git a/stream-servers/RenderThread.cpp b/stream-servers/RenderThread.cpp
index 21b44fd..8a00801 100644
--- a/stream-servers/RenderThread.cpp
+++ b/stream-servers/RenderThread.cpp
@@ -337,7 +337,7 @@
// delete[] fname;
}
- GfxApiLogger gfx_logger;
+ GfxApiLogger gfxLogger;
uint32_t* seqnoPtr = nullptr;
@@ -441,7 +441,7 @@
// so we do it outside the limiter
if (tInfo.m_vkDec) {
last = tInfo.m_vkDec->decode(readBuf.buf(), readBuf.validData(), ioStream, seqnoPtr,
- gfx_logger);
+ gfxLogger);
if (last > 0) {
readBuf.consume(last);
progress = true;
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.cpp b/stream-servers/vulkan/VkDecoderGlobalState.cpp
index 9f10247..f0d7fec 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.cpp
+++ b/stream-servers/vulkan/VkDecoderGlobalState.cpp
@@ -4003,7 +4003,7 @@
VkResult on_vkBeginCommandBuffer(android::base::BumpPool* pool,
VkCommandBuffer boxed_commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo,
- GfxApiLogger& gfx_logger) {
+ GfxApiLogger& gfxLogger) {
auto commandBuffer = unbox_VkCommandBuffer(boxed_commandBuffer);
auto vk = dispatch_VkCommandBuffer(boxed_commandBuffer);
VkResult result = vk->vkBeginCommandBuffer(commandBuffer, pBeginInfo);
@@ -4021,12 +4021,12 @@
VkResult on_vkBeginCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer boxed_commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo,
- GfxApiLogger& gfx_logger) {
- return this->on_vkBeginCommandBuffer(pool, boxed_commandBuffer, pBeginInfo, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ return this->on_vkBeginCommandBuffer(pool, boxed_commandBuffer, pBeginInfo, gfxLogger);
}
VkResult on_vkEndCommandBuffer(android::base::BumpPool* pool,
- VkCommandBuffer boxed_commandBuffer, GfxApiLogger& gfx_logger) {
+ VkCommandBuffer boxed_commandBuffer, GfxApiLogger& gfxLogger) {
auto commandBuffer = unbox_VkCommandBuffer(boxed_commandBuffer);
auto vk = dispatch_VkCommandBuffer(boxed_commandBuffer);
@@ -4035,8 +4035,8 @@
void on_vkEndCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer boxed_commandBuffer,
- GfxApiLogger& gfx_logger) {
- on_vkEndCommandBuffer(pool, boxed_commandBuffer, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ on_vkEndCommandBuffer(pool, boxed_commandBuffer, gfxLogger);
}
void on_vkResetCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
@@ -4422,13 +4422,13 @@
void on_vkQueueFlushCommandsGOOGLE(android::base::BumpPool* pool, VkQueue queue,
VkCommandBuffer boxed_commandBuffer, VkDeviceSize dataSize,
- const void* pData, GfxApiLogger& gfx_logger) {
+ const void* pData, GfxApiLogger& gfxLogger) {
(void)queue;
VkCommandBuffer commandBuffer = unbox_VkCommandBuffer(boxed_commandBuffer);
VulkanDispatch* vk = dispatch_VkCommandBuffer(boxed_commandBuffer);
VulkanMemReadingStream* readStream = readstream_VkCommandBuffer(boxed_commandBuffer);
- subDecode(readStream, vk, boxed_commandBuffer, commandBuffer, dataSize, pData, gfx_logger);
+ subDecode(readStream, vk, boxed_commandBuffer, commandBuffer, dataSize, pData, gfxLogger);
}
VkDescriptorSet getOrAllocateDescriptorSetFromPoolAndId(VulkanDispatch* vk, VkDevice device,
@@ -7401,26 +7401,26 @@
VkResult VkDecoderGlobalState::on_vkBeginCommandBuffer(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo,
- GfxApiLogger& gfx_logger) {
- return mImpl->on_vkBeginCommandBuffer(pool, commandBuffer, pBeginInfo, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ return mImpl->on_vkBeginCommandBuffer(pool, commandBuffer, pBeginInfo, gfxLogger);
}
void VkDecoderGlobalState::on_vkBeginCommandBufferAsyncGOOGLE(
android::base::BumpPool* pool, VkCommandBuffer commandBuffer,
- const VkCommandBufferBeginInfo* pBeginInfo, GfxApiLogger& gfx_logger) {
- mImpl->on_vkBeginCommandBuffer(pool, commandBuffer, pBeginInfo, gfx_logger);
+ const VkCommandBufferBeginInfo* pBeginInfo, GfxApiLogger& gfxLogger) {
+ mImpl->on_vkBeginCommandBuffer(pool, commandBuffer, pBeginInfo, gfxLogger);
}
VkResult VkDecoderGlobalState::on_vkEndCommandBuffer(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
- GfxApiLogger& gfx_logger) {
- return mImpl->on_vkEndCommandBuffer(pool, commandBuffer, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ return mImpl->on_vkEndCommandBuffer(pool, commandBuffer, gfxLogger);
}
void VkDecoderGlobalState::on_vkEndCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
- GfxApiLogger& gfx_logger) {
- mImpl->on_vkEndCommandBufferAsyncGOOGLE(pool, commandBuffer, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ mImpl->on_vkEndCommandBufferAsyncGOOGLE(pool, commandBuffer, gfxLogger);
}
void VkDecoderGlobalState::on_vkResetCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
@@ -7557,8 +7557,8 @@
VkQueue queue,
VkCommandBuffer commandBuffer,
VkDeviceSize dataSize, const void* pData,
- GfxApiLogger& gfx_logger) {
- mImpl->on_vkQueueFlushCommandsGOOGLE(pool, queue, commandBuffer, dataSize, pData, gfx_logger);
+ GfxApiLogger& gfxLogger) {
+ mImpl->on_vkQueueFlushCommandsGOOGLE(pool, queue, commandBuffer, dataSize, pData, gfxLogger);
}
void VkDecoderGlobalState::on_vkQueueCommitDescriptorSetUpdatesGOOGLE(
diff --git a/stream-servers/vulkan/VkDecoderGlobalState.h b/stream-servers/vulkan/VkDecoderGlobalState.h
index 0f98ea5..7701fe6 100644
--- a/stream-servers/vulkan/VkDecoderGlobalState.h
+++ b/stream-servers/vulkan/VkDecoderGlobalState.h
@@ -73,7 +73,7 @@
bool vkCleanupEnabled() const;
void save(android::base::Stream* stream);
- void load(android::base::Stream* stream, emugl::GfxApiLogger& gfx_logger);
+ void load(android::base::Stream* stream, emugl::GfxApiLogger& gfxLogger);
// Lock/unlock of global state to serve as a global lock
void lock();
@@ -488,16 +488,16 @@
VkResult on_vkBeginCommandBuffer(android::base::BumpPool* pool, VkCommandBuffer commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo,
- emugl::GfxApiLogger& gfx_logger);
+ emugl::GfxApiLogger& gfxLogger);
void on_vkBeginCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
const VkCommandBufferBeginInfo* pBeginInfo,
- emugl::GfxApiLogger& gfx_logger);
+ emugl::GfxApiLogger& gfxLogger);
VkResult on_vkEndCommandBuffer(android::base::BumpPool* pool, VkCommandBuffer commandBuffer,
- emugl::GfxApiLogger& gfx_logger);
+ emugl::GfxApiLogger& gfxLogger);
void on_vkEndCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
- emugl::GfxApiLogger& gfx_logger);
+ emugl::GfxApiLogger& gfxLogger);
void on_vkResetCommandBufferAsyncGOOGLE(android::base::BumpPool* pool,
VkCommandBuffer commandBuffer,
VkCommandBufferResetFlags flags);
@@ -569,7 +569,7 @@
// VK_GOOGLE_gfxstream
void on_vkQueueFlushCommandsGOOGLE(android::base::BumpPool* pool, VkQueue queue,
VkCommandBuffer commandBuffer, VkDeviceSize dataSize,
- const void* pData, emugl::GfxApiLogger& gfx_logger);
+ const void* pData, emugl::GfxApiLogger& gfxLogger);
void on_vkQueueCommitDescriptorSetUpdatesGOOGLE(
android::base::BumpPool* pool, VkQueue queue, uint32_t descriptorPoolCount,
const VkDescriptorPool* pDescriptorPools, uint32_t descriptorSetCount,
