From d8b6419d8a008ecaf61ef5fdcaebbb265ba4e03f Mon Sep 17 00:00:00 2001 From: rachytski Date: Thu, 3 Nov 2011 18:37:12 +0400 Subject: [PATCH] minor style fixes. --- yg/blitter.cpp | 2 +- yg/geometry_batcher.cpp | 4 ++-- yg/geometry_renderer.cpp | 6 ++---- yg/render_state_updater.cpp | 2 +- yg/renderer.cpp | 11 ++++++++++- yg/renderer.hpp | 9 +++++++++ 6 files changed, 25 insertions(+), 9 deletions(-) diff --git a/yg/blitter.cpp b/yg/blitter.cpp index 2ee9207275..1f1c95f8a1 100644 --- a/yg/blitter.cpp +++ b/yg/blitter.cpp @@ -314,7 +314,7 @@ namespace yg void Blitter::IMMDrawTexturedPrimitives::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing IMMDrawTexturedPrimitives command")); yg::gl::Storage blitStorage = m_resourceManager->blitStorages()->Reserve(); diff --git a/yg/geometry_batcher.cpp b/yg/geometry_batcher.cpp index 0787a66e7e..ff94e8d57f 100644 --- a/yg/geometry_batcher.cpp +++ b/yg/geometry_batcher.cpp @@ -77,7 +77,7 @@ namespace yg void GeometryBatcher::FreeStorage::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing FreeStorage command")); m_storagePool->Free(m_storage); } @@ -279,7 +279,7 @@ namespace yg void GeometryBatcher::FreeTexture::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing FreeTexture command")); m_texturePool->Free(m_texture); } diff --git a/yg/geometry_renderer.cpp b/yg/geometry_renderer.cpp index e9845dae58..39be99d4fd 100644 --- a/yg/geometry_renderer.cpp +++ b/yg/geometry_renderer.cpp @@ -24,7 +24,7 @@ namespace yg void GeometryRenderer::DrawGeometry::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing DrawGeometry command")); m_vertices->makeCurrent(); @@ -55,14 +55,13 @@ namespace yg command->m_indices = indices; command->m_vertices = vertices; command->m_indicesCount = indicesCount; - command->m_isDebugging = renderQueue(); processCommand(command); } void GeometryRenderer::UploadData::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing UploadData command")); static_cast(m_texture.get())->lock(); @@ -90,7 +89,6 @@ namespace yg shared_ptr uploadData(new UploadData()); uploadData->m_styles = v; uploadData->m_texture = texture; - uploadData->m_isDebugging = renderQueue(); processCommand(uploadData); } diff --git a/yg/render_state_updater.cpp b/yg/render_state_updater.cpp index 77732ff0e3..19a9e8590c 100644 --- a/yg/render_state_updater.cpp +++ b/yg/render_state_updater.cpp @@ -60,7 +60,7 @@ namespace yg void RenderStateUpdater::UpdateBackBuffer::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing UpdateBackBuffer command")); OGLCHECK(glFinish()); diff --git a/yg/renderer.cpp b/yg/renderer.cpp index 300b6e593e..93dc53f554 100644 --- a/yg/renderer.cpp +++ b/yg/renderer.cpp @@ -14,6 +14,15 @@ namespace yg Renderer::BaseState::~BaseState() {} + bool Renderer::Command::isDebugging() const + { + return m_isDebugging; + } + + Renderer::Command::Command() + : m_isDebugging(false) + {} + Renderer::Command::~Command() {} @@ -151,7 +160,7 @@ namespace yg void Renderer::ClearCommand::perform() { - if (m_isDebugging) + if (isDebugging()) LOG(LINFO, ("performing clear command")); OGLCHECK(glClearColor(m_color.r / 255.0f, m_color.g / 255.0f, diff --git a/yg/renderer.hpp b/yg/renderer.hpp index b38f827322..072f3d12dd 100644 --- a/yg/renderer.hpp +++ b/yg/renderer.hpp @@ -39,9 +39,18 @@ namespace yg struct Command { + private: bool m_isDebugging; + public: + + bool isDebugging() const; + + Command(); + virtual ~Command(); virtual void perform() = 0; + + friend class Renderer; }; struct Packet