diff options
author | kkinnunen <kkinnunen@nvidia.com> | 2014-06-22 22:56:53 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-06-22 22:56:54 -0700 |
commit | 74fc727dc88ee24d89f88cb1709f963e9073aeb3 (patch) | |
tree | c1bc9dd2101168a5fbb2b9d523aafac3828c7876 /src/gpu/gl/angle | |
parent | 32956400b4d8f33394e2cdef9b66e8369ba2a0f3 (diff) |
Support using OpenGL ES context on desktop
Support using OpenGL ES context on desktop for unix and Android platforms. This
is mainly useful in development.
Add --gpuAPI flag to gm, dm, bench, bench_pictures and render_pictures. The
possible parameters for the flag are "gl" and "gles".
R=bsalomon@google.com, mtklein@google.com, robertphillips@google.com
Author: kkinnunen@nvidia.com
Review URL: https://codereview.chromium.org/319043005
Diffstat (limited to 'src/gpu/gl/angle')
-rw-r--r-- | src/gpu/gl/angle/SkANGLEGLContext.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/gpu/gl/angle/SkANGLEGLContext.cpp b/src/gpu/gl/angle/SkANGLEGLContext.cpp index 2600ec4634..884fe7ca11 100644 --- a/src/gpu/gl/angle/SkANGLEGLContext.cpp +++ b/src/gpu/gl/angle/SkANGLEGLContext.cpp @@ -52,7 +52,10 @@ void SkANGLEGLContext::destroyGLContext() { } } -const GrGLInterface* SkANGLEGLContext::createGLContext() { +const GrGLInterface* SkANGLEGLContext::createGLContext(GrGLStandard forcedGpuAPI) { + if (kGL_GrGLStandard == forcedGpuAPI) { + return NULL; + } fDisplay = eglGetDisplay(EGL_DEFAULT_DISPLAY); |