From fee994c36717b304731d475ac7eb48b98e8a34e3 Mon Sep 17 00:00:00 2001 From: "adam.fedor" Date: Fri, 9 Jun 2017 05:16:10 -0700 Subject: [PATCH] Ensure the openGLContext is current before trying to reshape the viewport Make sure to call ensureGLContext before calling OpenGL functions BUG=webrtc:7751 Review-Url: https://codereview.webrtc.org/2916583005 Cr-Commit-Position: refs/heads/master@{#18511} --- webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m | 1 + 1 file changed, 1 insertion(+) diff --git a/webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m b/webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m index 3b7008728c..9578f820a3 100644 --- a/webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m +++ b/webrtc/sdk/objc/Framework/Classes/UI/RTCNSGLVideoView.m @@ -77,6 +77,7 @@ static CVReturn OnDisplayLinkFired(CVDisplayLinkRef displayLink, - (void)reshape { [super reshape]; NSRect frame = [self frame]; + [self ensureGLContext]; CGLLockContext([[self openGLContext] CGLContextObj]); glViewport(0, 0, frame.size.width, frame.size.height); CGLUnlockContext([[self openGLContext] CGLContextObj]);