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

fix problem with solid black text rendering on XXHDPI

Browse source
This commit is contained in:
ExMix 2013-09-12 20:05:25 +03:00 • committed by Alex Zolotarev
parent 1f7f812d6a
commit f6e5a5988a
9 changed files with 64 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
base/math.hpp
View file

@ -127,4 +127,16 @@ template <typename T> inline T PrevModN(T x, T n)
return x == 0 ? n - 1 : x - 1;
}
inline uint32_t NextPowOf2(uint32_t v)
{
v = v - 1;
v |= (v >> 1);
v |= (v >> 2);
v |= (v >> 4);
v |= (v >> 8);
v |= (v >> 16);
return v + 1;
}
}

22
graphics/opengl/geometry_renderer.cpp
View file

@ -11,25 +11,11 @@
#include "../../base/logging.hpp"
#include "../../base/shared_buffer_manager.hpp"
#include "../../base/math.hpp"
#include "../../std/bind.hpp"
namespace graphics
{
namespace
{
unsigned NextPowerOf2(unsigned n)
{
n = n - 1;
n |= (n >> 1);
n |= (n >> 2);
n |= (n >> 4);
n |= (n >> 8);
n |= (n >> 16);
return n + 1;
}
}
namespace gl
{
typedef Texture<DATA_TRAITS, true> TDynamicTexture;
@ -117,9 +103,9 @@ namespace graphics
currentRect.setMinX(currentRect.minX() - maxRect.minX());
currentRect.setMaxX(currentRect.maxX() - maxRect.minX());
size_t renderBufferSize = NextPowerOf2(currentRect.SizeX() *
currentRect.SizeY() *
sizeof(TDynamicTexture::pixel_t));
size_t renderBufferSize = my::NextPowOf2(currentRect.SizeX() *
currentRect.SizeY() *
sizeof(TDynamicTexture::pixel_t));
SharedBufferManager::shared_buffer_ptr_t buffer = SharedBufferManager::instance().reserveSharedBuffer(renderBufferSize);
TDynamicTexture::view_t bufferView = gil::interleaved_view(currentRect.SizeX(),
currentRect.SizeY(),

5
graphics/resource_manager.cpp
View file

@ -287,6 +287,11 @@ namespace
LOG(LINFO, ("using ReadPixels instead of glFinish to synchronize"));
}
bool ResourceManager::Params::canUseNPOTextures()
{
return graphics::gl::HasExtension("GL_OES_texture_npot");
}
void ResourceManager::loadSkinInfoAndTexture(string const & skinFileName, EDensity density)
{
try

1
graphics/resource_manager.hpp
View file

@ -210,6 +210,7 @@ namespace graphics
int memoryUsage() const;
int fixedMemoryUsage() const;
void initScaleWeights();
bool canUseNPOTextures();
};
private:

25
map/render_policy.cpp
View file

@ -281,6 +281,30 @@ Drawer * RenderPolicy::CreateDrawer(bool isDefaultFB,
return new Drawer(dp);
}
size_t RenderPolicy::GetLargeTextureSize(bool useNpot)
{
UNUSED_VALUE(useNpot);
return 512;
}
size_t RenderPolicy::GetMediumTextureSize(bool useNpot)
{
uint32_t size = 256 * VisualScale();
if (useNpot)
return size;
return my::NextPowOf2(size);
}
size_t RenderPolicy::GetSmallTextureSize(bool useNpot)
{
uint32_t size = 128 * VisualScale();
if (useNpot)
return size;
return my::NextPowOf2(size);
}
graphics::ResourceManager::StoragePoolParams RenderPolicy::GetStorageParam(size_t vertexCount,
size_t indexCount,
size_t batchSize,
@ -298,6 +322,7 @@ graphics::ResourceManager::TexturePoolParams RenderPolicy::GetTextureParam(size_
graphics::DataFormat format,
graphics::ETextureType type)
{
LOG(LDEBUG, ("Texture creating size = ", size));
return graphics::ResourceManager::TexturePoolParams(size, size, initCount, format, type, false);
}

5
map/render_policy.hpp
View file

@ -175,6 +175,11 @@ protected:
shared_ptr<graphics::RenderContext> context,
graphics::EStorageType storageType,
graphics::ETextureType textureType);
size_t GetLargeTextureSize(bool useNpot);
size_t GetMediumTextureSize(bool useNpot);
size_t GetSmallTextureSize(bool useNpot);
graphics::ResourceManager::StoragePoolParams GetStorageParam(size_t vertexCount,
size_t indexCount,
size_t batchSize,

8
map/simple_render_policy.cpp
View file

@ -20,11 +20,11 @@ SimpleRenderPolicy::SimpleRenderPolicy(Params const & p)
graphics::ResourceManager::Params rmp = p.m_rmParams;
rmp.checkDeviceCaps();
double k = VisualScale();
bool useNpot = rmp.canUseNPOTextures();
rmp.m_textureParams[ELargeTexture] = GetTextureParam(512, 10, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(256 * k, 5, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(128 * k, 4, rmp.m_texFormat, ESmallTexture);
rmp.m_textureParams[ELargeTexture] = GetTextureParam(GetLargeTextureSize(useNpot), 10, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(GetMediumTextureSize(useNpot), 5, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(GetSmallTextureSize(useNpot), 4, rmp.m_texFormat, ESmallTexture);
rmp.m_storageParams[ELargeStorage] = GetStorageParam(50000, 100000, 15, ELargeStorage);
rmp.m_storageParams[EMediumStorage] = GetStorageParam(5000, 10000, 100, EMediumStorage);

8
map/tiling_render_policy_mt.cpp
View file

@ -18,12 +18,12 @@ TilingRenderPolicyMT::TilingRenderPolicyMT(Params const & p)
graphics::ResourceManager::Params rmp = p.m_rmParams;
rmp.checkDeviceCaps();
int k = int(ceil(VisualScale()));
bool useNpot = rmp.canUseNPOTextures();
rmp.m_textureParams[ELargeTexture] = GetTextureParam(512, 1, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(256 * k, 1, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ELargeTexture] = GetTextureParam(GetLargeTextureSize(useNpot), 1, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(GetMediumTextureSize(useNpot), 1, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ERenderTargetTexture] = GetTextureParam(TileSize(), 1, rmp.m_texRtFormat, ERenderTargetTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(128 * k, 4, rmp.m_texFormat, ESmallTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(GetSmallTextureSize(useNpot), 4, rmp.m_texFormat, ESmallTexture);
rmp.m_storageParams[ELargeStorage] = GetStorageParam(50000, 100000, 5, ELargeStorage);
rmp.m_storageParams[EMediumStorage] = GetStorageParam(6000, 9000, 1, EMediumStorage);

9
map/tiling_render_policy_st.cpp
View file

@ -21,13 +21,12 @@ TilingRenderPolicyST::TilingRenderPolicyST(Params const & p)
ResourceManager::Params rmp = p.m_rmParams;
rmp.checkDeviceCaps();
bool useNpot = rmp.canUseNPOTextures();
int k = int(ceil(VisualScale()));
rmp.m_textureParams[ELargeTexture] = GetTextureParam(512, 1, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(256 * k, 10, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ELargeTexture] = GetTextureParam(GetLargeTextureSize(useNpot), 1, rmp.m_texFormat, ELargeTexture);
rmp.m_textureParams[EMediumTexture] = GetTextureParam(GetMediumTextureSize(useNpot), 10, rmp.m_texFormat, EMediumTexture);
rmp.m_textureParams[ERenderTargetTexture] = GetTextureParam(TileSize(), 1, rmp.m_texRtFormat, ERenderTargetTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(128 * k, 2, rmp.m_texFormat, ESmallTexture);
rmp.m_textureParams[ESmallTexture] = GetTextureParam(GetSmallTextureSize(useNpot), 2, rmp.m_texFormat, ESmallTexture);
rmp.m_storageParams[ELargeStorage] = GetStorageParam(6000, 9000, 10, ELargeStorage);
rmp.m_storageParams[EMediumStorage] = GetStorageParam(6000, 9000, 1, EMediumStorage);