Mercurial > hg > orthanc-stone

diff Framework/Scene2D/OpenGLCompositor.cpp @ 892:50cd372e2460

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix OpenGL context for fonts
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 11 Jul 2019 09:18:55 +0200
parents 0aff28f15ea2
children 9c2f6d6b9f4a
line wrap: on
line diff
--- a/Framework/Scene2D/OpenGLCompositor.cpp	Wed Jul 10 18:18:42 2019 +0200
+++ b/Framework/Scene2D/OpenGLCompositor.cpp	Thu Jul 11 09:18:55 2019 +0200
@@ -149,11 +149,11 @@
   
   void OpenGLCompositor::Refresh()
   {
+    context_.MakeCurrent();
+
     canvasWidth_ = context_.GetCanvasWidth();
     canvasHeight_ = context_.GetCanvasHeight();
 
-    context_.MakeCurrent();
-
     glViewport(0, 0, canvasWidth_, canvasHeight_);
     glClearColor(0, 0, 0, 1);
     glClear(GL_COLOR_BUFFER_BIT);
@@ -167,6 +167,8 @@
   void OpenGLCompositor::SetFont(size_t index,
                                  const GlyphBitmapAlphabet& dict)
   {
+    context_.MakeCurrent();
+      
     std::auto_ptr<Font> font(new Font(dict));
       
     Fonts::iterator found = fonts_.find(index);