[gtk/wip/chergert/gdk-macos-gl-renderer: 24/26] macos: avoid duplicate call and update GL context




commit 8995801c9373714ad652ff51f71d22e92e984e0d
Author: Christian Hergert <chergert redhat com>
Date:   Wed Oct 28 15:15:21 2020 -0700

    macos: avoid duplicate call and update GL context

 gdk/macos/GdkMacosGLView.c    | 1 +
 gdk/macos/gdkmacosglcontext.c | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gdk/macos/GdkMacosGLView.c b/gdk/macos/GdkMacosGLView.c
index ce84f98218..64bd0e89c3 100644
--- a/gdk/macos/GdkMacosGLView.c
+++ b/gdk/macos/GdkMacosGLView.c
@@ -70,6 +70,7 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
           [_openGLContext setView:self];
           [self setWantsLayer:YES];
           [self.layer setContentsGravity:kCAGravityBottomLeft];
+          [_openGLContext update];
         }
     }
 }
diff --git a/gdk/macos/gdkmacosglcontext.c b/gdk/macos/gdkmacosglcontext.c
index fab6cfde42..e3741f5d17 100644
--- a/gdk/macos/gdkmacosglcontext.c
+++ b/gdk/macos/gdkmacosglcontext.c
@@ -284,7 +284,6 @@ gdk_macos_gl_context_begin_frame (GdkDrawContext *context,
       g_assert (GDK_IS_MACOS_GL_VIEW (nsview));
 
       [(GdkMacosGLView *)nsview setOpenGLContext:self->gl_context];
-      [self->gl_context setView:nsview];
     }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]