From 88088d3c09185ee48a68f3acf946d59e8888d155 Mon Sep 17 00:00:00 2001 From: ExMix Date: Thu, 31 Oct 2013 12:53:45 +0300 Subject: [PATCH] remove useless code --- android/jni/com/mapswithme/maps/Framework.cpp | 1 - graphics/resource_manager.cpp | 8 ++------ graphics/resource_manager.hpp | 2 -- iphone/Maps/Classes/EAGLView.mm | 11 ++--------- map_server/main.cpp | 1 - qt/draw_widget.cpp | 1 - qt_tstfrm/tstwidgets.cpp | 2 -- yopme_desktop/glwidget.cpp | 1 - 8 files changed, 4 insertions(+), 23 deletions(-) diff --git a/android/jni/com/mapswithme/maps/Framework.cpp b/android/jni/com/mapswithme/maps/Framework.cpp index de83385dae..ebd056f214 100644 --- a/android/jni/com/mapswithme/maps/Framework.cpp +++ b/android/jni/com/mapswithme/maps/Framework.cpp @@ -133,7 +133,6 @@ namespace android graphics::ResourceManager::Params rmParams; rmParams.m_videoMemoryLimit = 30 * 1024 * 1024; - rmParams.m_rtFormat = graphics::Data8Bpp; rmParams.m_texFormat = graphics::Data4Bpp; RenderPolicy::Params rpParams; diff --git a/graphics/resource_manager.cpp b/graphics/resource_manager.cpp index efbb59162a..1bac2ef0d3 100644 --- a/graphics/resource_manager.cpp +++ b/graphics/resource_manager.cpp @@ -201,8 +201,7 @@ namespace } ResourceManager::Params::Params() - : m_rtFormat(graphics::Data8Bpp), - m_texFormat(graphics::Data4Bpp), + : m_texFormat(graphics::Data4Bpp), m_texRtFormat(graphics::Data4Bpp), m_useSingleThreadedOGL(false), m_videoMemoryLimit(0), @@ -247,10 +246,7 @@ namespace m_texRtFormat = graphics::Data8Bpp; if (isGPU("Imagination Technologies", "PowerVR MBX", false)) - { - m_rtFormat = graphics::Data8Bpp; m_texRtFormat = graphics::Data8Bpp; - } LOG(LINFO, ("selected", graphics::formatName(m_texRtFormat), "format for tile textures")); } @@ -428,7 +424,7 @@ namespace shared_ptr ResourceManager::createRenderTarget(unsigned w, unsigned h) { - switch (m_params.m_rtFormat) + switch (m_params.m_texRtFormat) { case Data8Bpp: return make_shared_ptr(new gl::Texture(w, h)); diff --git a/graphics/resource_manager.hpp b/graphics/resource_manager.hpp index 1eaabc74c1..af5cb6544e 100644 --- a/graphics/resource_manager.hpp +++ b/graphics/resource_manager.hpp @@ -181,8 +181,6 @@ namespace graphics bool isGPU(char const * vendorName, char const * rendererName, bool strictMatch) const; public: - - DataFormat m_rtFormat; DataFormat m_texFormat; DataFormat m_texRtFormat; bool m_useSingleThreadedOGL; diff --git a/iphone/Maps/Classes/EAGLView.mm b/iphone/Maps/Classes/EAGLView.mm index fc92d01da7..0cef454a4b 100644 --- a/iphone/Maps/Classes/EAGLView.mm +++ b/iphone/Maps/Classes/EAGLView.mm @@ -70,13 +70,7 @@ - (void)initRenderPolicy { NSLog(@"EAGLView initRenderPolicy Started"); - - // to avoid grid bug on 3G device - graphics::DataFormat rtFmt = graphics::Data4Bpp; - graphics::DataFormat texFmt = graphics::Data4Bpp; - if ([[NSString stringWithFormat:@"%s", glGetString(GL_RENDERER)] hasPrefix:@"PowerVR MBX"]) - rtFmt = graphics::Data8Bpp; - + typedef void (*drawFrameFn)(id, SEL); SEL drawFrameSel = @selector(drawFrame); drawFrameFn drawFrameImpl = (drawFrameFn)[self methodForSelector:drawFrameSel]; @@ -85,8 +79,7 @@ graphics::ResourceManager::Params rmParams; rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit(); - rmParams.m_rtFormat = rtFmt; - rmParams.m_texFormat = texFmt; + rmParams.m_texFormat = graphics::Data4Bpp; RenderPolicy::Params rpParams; diff --git a/map_server/main.cpp b/map_server/main.cpp index b747cdbdda..1e177c15c4 100644 --- a/map_server/main.cpp +++ b/map_server/main.cpp @@ -41,7 +41,6 @@ MwmRpcService::MwmRpcService(QObject * parent) : m_pixelBuffer(new QGLPixelBuffe m_pixelBuffer->makeCurrent(); shared_ptr primaryRC(new srv::RenderContext()); graphics::ResourceManager::Params rmParams; - rmParams.m_rtFormat = graphics::Data8Bpp; rmParams.m_texFormat = graphics::Data8Bpp; rmParams.m_texRtFormat = graphics::Data4Bpp; rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit(); diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 73e0c6a559..8985bb5a3f 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -245,7 +245,6 @@ namespace qt shared_ptr primaryRC(new qt::gl::RenderContext(this)); graphics::ResourceManager::Params rmParams; - rmParams.m_rtFormat = graphics::Data8Bpp; rmParams.m_texFormat = graphics::Data8Bpp; rmParams.m_texRtFormat = graphics::Data4Bpp; rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit(); diff --git a/qt_tstfrm/tstwidgets.cpp b/qt_tstfrm/tstwidgets.cpp index 10e2500083..7be9eee3e5 100644 --- a/qt_tstfrm/tstwidgets.cpp +++ b/qt_tstfrm/tstwidgets.cpp @@ -27,8 +27,6 @@ namespace tst m_primaryContext = make_shared_ptr(new qt::gl::RenderContext(this)); graphics::ResourceManager::Params rmp; - - rmp.m_rtFormat = graphics::Data8Bpp; rmp.m_texFormat = graphics::Data8Bpp; rmp.m_videoMemoryLimit = 20 * 1024 * 1024; diff --git a/yopme_desktop/glwidget.cpp b/yopme_desktop/glwidget.cpp index 7d459fe604..cf2e507f56 100644 --- a/yopme_desktop/glwidget.cpp +++ b/yopme_desktop/glwidget.cpp @@ -22,7 +22,6 @@ void GLWidget::initializeGL() { shared_ptr primaryRC(new qt::gl::RenderContext(this)); graphics::ResourceManager::Params rmParams; - rmParams.m_rtFormat = graphics::Data8Bpp; rmParams.m_texFormat = graphics::Data8Bpp; rmParams.m_texRtFormat = graphics::Data8Bpp; rmParams.m_videoMemoryLimit = GetPlatform().VideoMemoryLimit();