diff options
author | Daria Volvenkova <d.volvenkova@corp.mail.ru> | 2017-05-16 14:42:32 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-05-16 14:42:32 +0300 |
commit | d2f79bd2c7004af2d1459e8d5b7748763f241a54 (patch) | |
tree | 64300bccb750e59f7c3a05800eafcd5c3b3f89cb /drape_frontend/backend_renderer.hpp | |
parent | aa6703383e8d4c2ff8445e8b3c27728846cdab4b (diff) | |
parent | 086d6f9cf247cea07cff6bc33d5567dc7c64806b (diff) |
Merge pull request #6040 from rokuz/es3-supportbeta-810
Added OpenGL ES3 support
Diffstat (limited to 'drape_frontend/backend_renderer.hpp')
-rw-r--r-- | drape_frontend/backend_renderer.hpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/drape_frontend/backend_renderer.hpp b/drape_frontend/backend_renderer.hpp index 6365c263eb..0c38709b11 100644 --- a/drape_frontend/backend_renderer.hpp +++ b/drape_frontend/backend_renderer.hpp @@ -9,21 +9,18 @@ #include "drape_frontend/overlay_batcher.hpp" #include "drape_frontend/requested_tiles.hpp" #include "drape_frontend/traffic_generator.hpp" -#include "drape_frontend/viewport.hpp" #include "drape/pointers.hpp" +#include "drape/viewport.hpp" namespace dp { - class OGLContextFactory; class TextureManager; - -} +} // namespace dp namespace df { - class Message; class ReadManager; class RouteBuilder; @@ -35,19 +32,20 @@ public: struct Params : BaseRenderer::Params { - Params(ref_ptr<ThreadsCommutator> commutator, ref_ptr<dp::OGLContextFactory> factory, - ref_ptr<dp::TextureManager> texMng, MapDataProvider const & model, - TUpdateCurrentCountryFn const & updateCurrentCountryFn, - ref_ptr<RequestedTiles> requestedTiles, bool allow3dBuildings, - bool trafficEnabled, bool simplifiedTrafficColors) - : BaseRenderer::Params(commutator, factory, texMng) + Params(dp::ApiVersion apiVersion, ref_ptr<ThreadsCommutator> commutator, + ref_ptr<dp::OGLContextFactory> factory, ref_ptr<dp::TextureManager> texMng, + MapDataProvider const & model, TUpdateCurrentCountryFn const & updateCurrentCountryFn, + ref_ptr<RequestedTiles> requestedTiles, bool allow3dBuildings, bool trafficEnabled, + bool simplifiedTrafficColors) + : BaseRenderer::Params(apiVersion, commutator, factory, texMng) , m_model(model) , m_updateCurrentCountryFn(updateCurrentCountryFn) , m_requestedTiles(requestedTiles) , m_allow3dBuildings(allow3dBuildings) , m_trafficEnabled(trafficEnabled) , m_simplifiedTrafficColors(simplifiedTrafficColors) - {} + { + } MapDataProvider const & m_model; TUpdateCurrentCountryFn m_updateCurrentCountryFn; |