diff options
author | borenet <borenet@google.com> | 2014-09-24 05:31:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-09-24 05:31:07 -0700 |
commit | e33985a56d4aa41b72b0e266897aa4f0100d6d2e (patch) | |
tree | 6b8700126c94f6d44de233aee8965441c925cd7d /src/gpu | |
parent | 6915f7f8498ea2a0e7c06e29c892cd32149bf0e4 (diff) |
Revert "Add support for EGL on linux"
This reverts commit 1cea736c3280b6f0553e3eaa598e41370b305b57.
Caused segfaults on all Android devices
R=bsalomon@google.com, djsollen@google.com
TBR=bsalomon, djsollen
NOTRY=true
BUG=skia:
Author: borenet@google.com
Review URL: https://codereview.chromium.org/599493003
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/gl/android/SkNativeGLContext_android.cpp (renamed from src/gpu/gl/egl/SkNativeGLContext_egl.cpp) | 0 | ||||
-rw-r--r-- | src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp | 22 |
2 files changed, 0 insertions, 22 deletions
diff --git a/src/gpu/gl/egl/SkNativeGLContext_egl.cpp b/src/gpu/gl/android/SkNativeGLContext_android.cpp index d4d7219b5b..d4d7219b5b 100644 --- a/src/gpu/gl/egl/SkNativeGLContext_egl.cpp +++ b/src/gpu/gl/android/SkNativeGLContext_android.cpp diff --git a/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp b/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp deleted file mode 100644 index ddc9e693a4..0000000000 --- a/src/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp +++ /dev/null @@ -1,22 +0,0 @@ - -/* - * Copyright 2014 Google Inc. - * - * Use of this source code is governed by a BSD-style license that can be - * found in the LICENSE file. - */ -#include "gl/GrGLInterface.h" -#include "gl/GrGLAssembleInterface.h" -#include "gl/GrGLUtil.h" - -#include <EGL/egl.h> -#include <GLES2/gl2.h> - -static GrGLFuncPtr egl_get_gl_proc(void* ctx, const char name[]) { - SkASSERT(NULL == ctx); - return eglGetProcAddress(name); -} - -const GrGLInterface* GrGLCreateNativeInterface() { - return GrGLAssembleInterface(NULL, egl_get_gl_proc); -} |