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:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2018-08-02 16:04:59 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2018-08-02 20:32:49 +0300
commitc43305029839d5c7c9ab2eeed370e56bd777cc41 (patch)
treee9fc909e179efa3e838dfd5b44378f3a750b857a /drape_frontend/user_mark_shapes.cpp
parent926cd384a1f6c34b6ea62d9b078d6fad38b92758 (diff)
Renamed GLState
Diffstat (limited to 'drape_frontend/user_mark_shapes.cpp')
-rw-r--r--drape_frontend/user_mark_shapes.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp
index f667a1fa5b..91b04ed6bf 100644
--- a/drape_frontend/user_mark_shapes.cpp
+++ b/drape_frontend/user_mark_shapes.cpp
@@ -300,7 +300,7 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
dp::TextureManager::SymbolRegion region;
dp::TextureManager::SymbolRegion backgroundRegion;
- RenderState::DepthLayer depthLayer = RenderState::UserMarkLayer;
+ DepthLayer depthLayer = DepthLayer::UserMarkLayer;
bool depthTestEnabled = true;
for (auto const id : marksId)
{
@@ -409,8 +409,8 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture
if (!buffer.empty())
{
- auto state = CreateGLState(isAnimated ? gpu::Program::BookmarkAnim
- : gpu::Program::Bookmark, depthLayer);
+ auto state = CreateRenderState(isAnimated ? gpu::Program::BookmarkAnim
+ : gpu::Program::Bookmark, depthLayer);
state.SetProgram3d(isAnimated ? gpu::Program::BookmarkAnimBillboard
: gpu::Program::BookmarkBillboard);
state.SetColorTexture(region.GetTexture());