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:
authorrachytski <siarhei.rachytski@gmail.com>2012-11-30 19:35:37 +0400
committerAlex Zolotarev <alex@maps.me>2015-09-23 01:47:45 +0300
commit2de2bdc3a1fe64656fdd720a71e3bbbca85dddde (patch)
tree286411d27036506762a76243f7099bc5783404b4 /map/qgl_render_context.cpp
parente0663bab7e418345061d826fcbdf77044981dd3b (diff)
refactored render states to use only programmable pipeline.
Diffstat (limited to 'map/qgl_render_context.cpp')
-rw-r--r--map/qgl_render_context.cpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/map/qgl_render_context.cpp b/map/qgl_render_context.cpp
index da9efd51b5..f898e5e5cf 100644
--- a/map/qgl_render_context.cpp
+++ b/map/qgl_render_context.cpp
@@ -29,18 +29,19 @@ namespace qt
void RenderContext::makeCurrent()
{
m_context->makeCurrent();
- startThreadDrawing();
}
shared_ptr<graphics::RenderContext> RenderContext::createShared()
{
- return shared_ptr<graphics::gl::RenderContext>(new RenderContext(this));
+ shared_ptr<graphics::gl::RenderContext> res(new RenderContext(this));
+ res->setResourceManager(resourceManager());
+ return res;
}
- void RenderContext::endThreadDrawing()
+ void RenderContext::endThreadDrawing(unsigned threadSlot)
{
m_context.reset();
- graphics::gl::RenderContext::endThreadDrawing();
+ graphics::gl::RenderContext::endThreadDrawing(threadSlot);
}
RenderContext::RenderContext(RenderContext * renderContext)