From fafa57faa33e89b538dd9ebb7eb70bf417adf6b0 Mon Sep 17 00:00:00 2001 From: rachytski Date: Fri, 30 Nov 2012 10:46:12 +0300 Subject: [PATCH] removed unused Blitter::blit overloads. --- graphics/blitter.cpp | 57 -------------------------------------------- graphics/blitter.hpp | 28 ---------------------- 2 files changed, 85 deletions(-) diff --git a/graphics/blitter.cpp b/graphics/blitter.cpp index 1d8f544ff2..54f3c3eb2d 100644 --- a/graphics/blitter.cpp +++ b/graphics/blitter.cpp @@ -22,22 +22,6 @@ namespace graphics { } - void Blitter::blit(shared_ptr const & srcSurface, - ScreenBase const & from, - ScreenBase const & to, - bool isSubPixel, - graphics::Color const & color, - m2::RectI const & srcRect, - m2::RectU const & texRect) - { - blit(srcSurface, - from.PtoGMatrix() * to.GtoPMatrix(), - isSubPixel, - color, - srcRect, - texRect); - } - void Blitter::blit(BlitInfo const * blitInfo, size_t s, bool isSubPixel) @@ -108,18 +92,6 @@ namespace graphics base_t::freeStorage(storage, resourceManager()->multiBlitStorages()); } - void Blitter::blit(shared_ptr const & srcSurface, - math::Matrix const & m, - bool isSubPixel) - { - blit(srcSurface, - m, - isSubPixel, - graphics::Color(), - m2::RectI(0, 0, srcSurface->width(), srcSurface->height()), - m2::RectU(0, 0, srcSurface->width(), srcSurface->height())); - } - void Blitter::calcPoints(m2::RectI const & srcRect, m2::RectU const & texRect, shared_ptr const & srcSurface, @@ -149,35 +121,6 @@ namespace graphics texPts[3] = srcSurface->mapPixel(m2::PointF(texRect.minX(), texRect.maxY())); } - void Blitter::blit(shared_ptr const & srcSurface, - math::Matrix const & m, - bool isSubPixel, - graphics::Color const & color, - m2::RectI const & srcRect, - m2::RectU const & texRect) - { - m2::PointF pts[4]; - m2::PointF texPts[4]; - - calcPoints(srcRect, texRect, srcSurface, m, isSubPixel, pts, texPts); - - immDrawTexturedPrimitives(pts, texPts, 4, srcSurface, true, color, false); - } - - void Blitter::blit(shared_ptr const & srcSurface, - ScreenBase const & from, - ScreenBase const & to, - bool isSubPixel) - { - blit(srcSurface, - from, - to, - isSubPixel, - graphics::Color(), - m2::RectI(0, 0, srcSurface->width(), srcSurface->height()), - m2::RectU(0, 0, srcSurface->width(), srcSurface->height())); - } - void Blitter::immDrawSolidRect(m2::RectF const & rect, graphics::Color const & color) { diff --git a/graphics/blitter.hpp b/graphics/blitter.hpp index fbd45470d8..687fd82784 100644 --- a/graphics/blitter.hpp +++ b/graphics/blitter.hpp @@ -32,10 +32,6 @@ namespace graphics class Blitter : public GeometryBatcher { - private: - - gl::Storage m_blitStorage; - protected: typedef GeometryBatcher base_t; @@ -56,30 +52,6 @@ namespace graphics /// they doesn't buffer any data as other functions do, but immediately renders it /// @{ - void blit(shared_ptr const & srcSurface, - ScreenBase const & from, - ScreenBase const & to, - bool isSubPixel, - graphics::Color const & color, - m2::RectI const & srcRect, - m2::RectU const & texRect); - - void blit(shared_ptr const & srcSurface, - ScreenBase const & from, - ScreenBase const & to, - bool isSubPixel = false); - - void blit(shared_ptr const & srcSurface, - math::Matrix const & m, - bool isSubPixel = false); - - void blit(shared_ptr const & srcSurface, - math::Matrix const & m, - bool isSubPixel, - graphics::Color const & color, - m2::RectI const & srcRect, - m2::RectU const & texRect); - void blit(BlitInfo const * blitInfo, size_t s, bool isSubPixel);