src/gpu/gl/iOS/SkNativeGLContext_iOS.mm - Issue 500153002: Remove reliance on linked in GL functions for assembling GLES interfaces

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/gpu/gl/iOS/SkNativeGLContext_iOS.mm

Issue 500153002: Remove reliance on linked in GL functions for assembling GLES interfaces (Closed) Base URL: https://skia.googlesource.com/skia.git@gmcfg

Patch Set: cleanup Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp ('K') | « src/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp ('k') | src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: src/gpu/gl/iOS/SkNativeGLContext_iOS.mm

diff --git a/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm b/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm

index 1e11c0deb7be8afd32fdbf83314f6b9b6d4717c0..f04229f16e752f061c707ec069f95240028b610b 100644

--- a/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm

+++ b/src/gpu/gl/iOS/SkNativeGLContext_iOS.mm

@@ -36,10 +36,13 @@ SkNativeGLContext::~SkNativeGLContext() {

}

void SkNativeGLContext::destroyGLContext() {

- if ([EAGLContext currentContext] == EAGLCTX) {

- [EAGLContext setCurrentContext:nil];

+ if (NULL != fEAGLContext) {

+ if ([EAGLContext currentContext] == EAGLCTX) {

+ [EAGLContext setCurrentContext:nil];

+ }

+ [EAGLCTX release];

+ fEAGLContext = NULL;

}

- [EAGLCTX release];

}

const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedGpuAPI) {