Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorExMix <rahuba.youri@mapswithme.com>2013-10-31 13:53:45 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 02:04:29 +0300
commit88088d3c09185ee48a68f3acf946d59e8888d155 (patch)
treec0a7affd72c16659319e4b752917c772c59efb2f
parentaf506c1e7edc53144d56765e1c5daeb890b677df (diff)
remove useless code
-rw-r--r--android/jni/com/mapswithme/maps/Framework.cpp1
-rw-r--r--graphics/resource_manager.cpp8
-rw-r--r--graphics/resource_manager.hpp2
-rw-r--r--iphone/Maps/Classes/EAGLView.mm11
-rw-r--r--map_server/main.cpp1
-rw-r--r--qt/draw_widget.cpp1
-rw-r--r--qt_tstfrm/tstwidgets.cpp2
-rw-r--r--yopme_desktop/glwidget.cpp1
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<graphics::gl::BaseTexture> 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<RGBA8Traits, false>(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<srv::RenderContext> 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<qt::gl::RenderContext> 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<graphics::RenderContext> 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();