From 7882e4c112df5052a9aac99a0567e6e6df34dd1b Mon Sep 17 00:00:00 2001 From: rachytski Date: Sat, 28 Jul 2012 21:32:25 -0700 Subject: [PATCH] renamed ECheckPoint to EFramePoint and added separate ECheckPoint packet type PacketsQueue. --- map/queued_renderer.cpp | 4 ++-- map/render_queue_routine.cpp | 2 +- yg/packets_queue.cpp | 2 +- yg/packets_queue.hpp | 1 + yg/renderer.cpp | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/map/queued_renderer.cpp b/map/queued_renderer.cpp index 873651ae14..5b03da8f25 100644 --- a/map/queued_renderer.cpp +++ b/map/queued_renderer.cpp @@ -94,7 +94,7 @@ bool QueuedRenderer::RenderQueuedCommands(int pipelineNum) } else { - ASSERT(bucketType == yg::gl::Packet::ECheckPoint, ()); + ASSERT(bucketType == yg::gl::Packet::EFramePoint, ()); if (it->m_command) it->m_command->perform(); @@ -152,7 +152,7 @@ void QueuedRenderer::PacketsPipeline::FillFrameCommands(list & r { yg::gl::Packet p = *last; - if (p.m_type == yg::gl::Packet::ECheckPoint) + if (p.m_type == yg::gl::Packet::EFramePoint) { /// found frame boundary, copying copy(first, ++last, back_inserter(m_FrameCommands)); diff --git a/map/render_queue_routine.cpp b/map/render_queue_routine.cpp index d6570402c5..cb1df64ac2 100644 --- a/map/render_queue_routine.cpp +++ b/map/render_queue_routine.cpp @@ -548,7 +548,7 @@ void RenderQueueRoutine::invalidate() { shared_ptr command(new Invalidate()); command->m_windowHandles = m_windowHandles; - m_glQueue->processPacket(yg::gl::Packet(command, yg::gl::Packet::ECheckPoint)); + m_glQueue->processPacket(yg::gl::Packet(command, yg::gl::Packet::EFramePoint)); } } diff --git a/yg/packets_queue.cpp b/yg/packets_queue.cpp index af72652d99..a2b369eaa6 100644 --- a/yg/packets_queue.cpp +++ b/yg/packets_queue.cpp @@ -91,7 +91,7 @@ namespace yg void PacketsQueue::completeCommands() { - joinFence(insertFence(Packet::ECheckPoint)); + joinFence(insertFence(Packet::EFramePoint)); } void PacketsQueue::cancelCommands() diff --git a/yg/packets_queue.hpp b/yg/packets_queue.hpp index e8e2da043d..2e2cded7cb 100644 --- a/yg/packets_queue.hpp +++ b/yg/packets_queue.hpp @@ -71,6 +71,7 @@ namespace yg { ECommand, ECheckPoint, + EFramePoint, ECancelPoint }; diff --git a/yg/renderer.cpp b/yg/renderer.cpp index 135b667e66..d1145e3cd4 100644 --- a/yg/renderer.cpp +++ b/yg/renderer.cpp @@ -271,7 +271,7 @@ namespace yg void Renderer::markFrameBoundary() { if (m_renderQueue) - m_renderQueue->processPacket(Packet(Packet::ECheckPoint)); + m_renderQueue->processPacket(Packet(Packet::EFramePoint)); } void Renderer::completeCommands()