kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

filtering "Vivante Corporation" chipsets to use vertex arrays instead of vertex buffers.

Browse source
This commit is contained in:
rachytski 2012-04-10 15:24:08 +04:00 • committed by Alex Zolotarev
parent b1740c4329
commit ab02f8cee9
8 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
map/render_policy_mt.cpp
View file

@ -15,7 +15,7 @@ RenderPolicyMT::RenderPolicyMT(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.selectTexRTFormat();
rmp.checkDeviceCaps();
rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(5000 * sizeof(yg::gl::Vertex),
sizeof(yg::gl::Vertex),
@ -109,7 +109,6 @@ RenderPolicyMT::RenderPolicyMT(VideoTimer * videoTimer,
1);
rmp.m_useSingleThreadedOGL = false;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();

3
map/render_policy_st.cpp
View file

@ -16,7 +16,7 @@ RenderPolicyST::RenderPolicyST(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.selectTexRTFormat();
rmp.checkDeviceCaps();
rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(5000 * sizeof(yg::gl::Vertex),
sizeof(yg::gl::Vertex),
@ -110,7 +110,6 @@ RenderPolicyST::RenderPolicyST(VideoTimer * videoTimer,
1);
rmp.m_useSingleThreadedOGL = true;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();

4
map/simple_render_policy.cpp
View file

@ -19,7 +19,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.selectTexRTFormat();
rmp.checkDeviceCaps();
rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(50000 * sizeof(yg::gl::Vertex),
sizeof(yg::gl::Vertex),
@ -90,7 +90,7 @@ SimpleRenderPolicy::SimpleRenderPolicy(VideoTimer * videoTimer,
rmp.m_useSingleThreadedOGL = false;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();
m_resourceManager.reset(new yg::ResourceManager(rmp));

4
map/test_render_policy.cpp
View file

@ -18,6 +18,8 @@ TestRenderPolicy::TestRenderPolicy(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.checkDeviceCaps();
rmp.m_primaryStoragesParams = yg::ResourceManager::StoragePoolParams(50000 * sizeof(yg::gl::Vertex),
sizeof(yg::gl::Vertex),
10000 * sizeof(unsigned short),
@ -87,7 +89,7 @@ TestRenderPolicy::TestRenderPolicy(VideoTimer * videoTimer,
rmp.m_useSingleThreadedOGL = false;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();
m_resourceManager.reset(new yg::ResourceManager(rmp));

4
map/tiling_render_policy_mt.cpp
View file

@ -18,7 +18,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.selectTexRTFormat();
rmp.checkDeviceCaps();
rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
256,
@ -113,7 +113,7 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(VideoTimer * videoTimer,
0);
rmp.m_useSingleThreadedOGL = false;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();
m_resourceManager.reset(new yg::ResourceManager(rmp));

4
map/tiling_render_policy_st.cpp
View file

@ -20,7 +20,7 @@ TilingRenderPolicyST::TilingRenderPolicyST(VideoTimer * videoTimer,
{
yg::ResourceManager::Params rmp = rmParams;
rmp.selectTexRTFormat();
rmp.checkDeviceCaps();
rmp.m_primaryTexturesParams = yg::ResourceManager::TexturePoolParams(512,
256,
@ -123,8 +123,6 @@ TilingRenderPolicyST::TilingRenderPolicyST(VideoTimer * videoTimer,
// delete [] debuggingFlags;
rmp.m_useSingleThreadedOGL = true;
rmp.m_useVA = !yg::gl::g_isBufferObjectsSupported;
rmp.fitIntoLimits();
m_maxTilesCount = rmp.m_renderTargetTexturesParams.m_texCount;

8
yg/resource_manager.cpp
View file

@ -403,10 +403,11 @@ namespace
&& (m_rendererName.find(rendererName) != string::npos);
}
void ResourceManager::Params::selectTexRTFormat()
void ResourceManager::Params::checkDeviceCaps()
{
/// general case
m_texRtFormat = yg::Data4Bpp;
m_useVA = !yg::gl::g_isBufferObjectsSupported;
if (isGPU("Qualcomm", "Adreno", false))
m_texRtFormat = yg::Data8Bpp;
@ -419,6 +420,11 @@ namespace
m_rtFormat = yg::Data8Bpp;
m_texRtFormat = yg::Data8Bpp;
}
/// filtering all devices from Vivante Corporation
/// to use vertex arrays
if (isGPU("Vivante Corporation", "", false))
m_useVA = true;
}
void ResourceManager::Params::fitIntoLimits()

2
yg/resource_manager.hpp
View file

@ -248,7 +248,7 @@ namespace yg
Params();
void distributeFreeMemory(int freeVideoMemory);
void selectTexRTFormat();
void checkDeviceCaps();
void fitIntoLimits();
int memoryUsage() const;
int fixedMemoryUsage() const;