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>2019-01-18 17:03:07 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2019-03-01 10:45:24 +0300
commitf53013310a9ce31e976e7bae78461e57b12cc0d2 (patch)
treec4534e4209e7411771401542ccc82db631349190 /drape/render_state.cpp
parentc1375c8dac6c5d027d62f010042056b5cddd8c08 (diff)
[drape] Refactored context access in textures, fixed iOS compilation
Diffstat (limited to 'drape/render_state.cpp')
-rw-r--r--drape/render_state.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/drape/render_state.cpp b/drape/render_state.cpp
index 93ab82baa8..77055cb9d2 100644
--- a/drape/render_state.cpp
+++ b/drape/render_state.cpp
@@ -210,7 +210,7 @@ void TextureState::ApplyTextures(ref_ptr<GraphicsContext> context, RenderState c
if (tex != nullptr && (texLoc = p->GetUniformLocation(texture.first)) >= 0)
{
GLFunctions::glActiveTexture(gl_const::GLTexture0 + m_usedSlots);
- tex->Bind();
+ tex->Bind(context);
GLFunctions::glUniformValuei(texLoc, m_usedSlots);
tex->SetFilter(state.GetTextureFilter());
m_usedSlots++;
@@ -225,7 +225,7 @@ void TextureState::ApplyTextures(ref_ptr<GraphicsContext> context, RenderState c
}
else if (apiVersion == dp::ApiVersion::Vulkan)
{
- //TODO(@rokuz, @darina): Implement.
+ //TODO(@rokuz, @darina): Implement. Use Bind!
}
else
{