diff options
| author | r.kuznetsov <r.kuznetsov@corp.mail.ru> | 2018-06-27 13:03:00 +0300 |
|---|---|---|
| committer | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2018-06-28 18:04:46 +0300 |
| commit | 5366ecf5b53757640522f24413cacc00397d3645 (patch) | |
| tree | 16c2a3efc9114e0a763ccdb09bf1cb7f570177e8 /drape_frontend/user_mark_shapes.cpp | |
| parent | fa65b1a203134bec37371fe818067f9ae7c821c8 (diff) | |
Usage of shaders library
Diffstat (limited to 'drape_frontend/user_mark_shapes.cpp')
| -rw-r--r-- | drape_frontend/user_mark_shapes.cpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drape_frontend/user_mark_shapes.cpp b/drape_frontend/user_mark_shapes.cpp index 040b3306e8..044ad63bb4 100644 --- a/drape_frontend/user_mark_shapes.cpp +++ b/drape_frontend/user_mark_shapes.cpp @@ -4,12 +4,13 @@ #include "drape_frontend/line_shape.hpp" #include "drape_frontend/map_shape.hpp" #include "drape_frontend/poi_symbol_shape.hpp" -#include "drape_frontend/shader_def.hpp" #include "drape_frontend/shape_view_params.hpp" #include "drape_frontend/text_shape.hpp" #include "drape_frontend/tile_utils.hpp" #include "drape_frontend/visual_params.hpp" +#include "shaders/programs.hpp" + #include "drape/utils/vertex_decl.hpp" #include "drape/attribute_provider.hpp" #include "drape/batcher.hpp" @@ -403,10 +404,10 @@ void CacheUserMarks(TileKey const & tileKey, ref_ptr<dp::TextureManager> texture if (!buffer.empty()) { - auto state = CreateGLState(isAnimated ? gpu::BOOKMARK_ANIM_PROGRAM - : gpu::BOOKMARK_PROGRAM, depthLayer); - state.SetProgram3dIndex(isAnimated ? gpu::BOOKMARK_ANIM_BILLBOARD_PROGRAM - : gpu::BOOKMARK_BILLBOARD_PROGRAM); + auto state = CreateGLState(isAnimated ? gpu::Program::BookmarkAnim + : gpu::Program::Bookmark, depthLayer); + state.SetProgram3d(isAnimated ? gpu::Program::BookmarkAnimBillboard + : gpu::Program::BookmarkBillboard); state.SetColorTexture(region.GetTexture()); state.SetTextureFilter(gl_const::GLNearest); |