src/gpu/gl/mac/SkNativeGLContext_mac.cpp - Issue 319043005: Support using OpenGL ES context on desktop

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/mac/SkNativeGLContext_mac.cpp

Issue 319043005: Support using OpenGL ES context on desktop (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 6 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:

Index: src/gpu/gl/mac/SkNativeGLContext_mac.cpp

diff --git a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp

index df316d7ed1f12e00963afacffab3d3e788b7be88..39b2be2a427d23b52e2609bb3c7c0f8af0f46490 100644

--- a/src/gpu/gl/mac/SkNativeGLContext_mac.cpp

+++ b/src/gpu/gl/mac/SkNativeGLContext_mac.cpp

@@ -32,8 +32,11 @@ void SkNativeGLContext::destroyGLContext() {

}

-const GrGLInterface* SkNativeGLContext::createGLContext() {

+const GrGLInterface* SkNativeGLContext::createGLContext(GrGLStandard forcedStandard) {

SkASSERT(NULL == fContext);

+ if (kGLES_GrGLStandard == forcedStandard) {

+ return NULL;

+ }

CGLPixelFormatAttribute attributes[] = {

#if MAC_OS_X_VERSION_10_7