aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/viewer/sk_app/android
diff options
context:
space:
mode:
Diffstat (limited to 'tools/viewer/sk_app/android')
-rw-r--r--tools/viewer/sk_app/android/GLWindowContext_android.cpp14
1 files changed, 8 insertions, 6 deletions
diff --git a/tools/viewer/sk_app/android/GLWindowContext_android.cpp b/tools/viewer/sk_app/android/GLWindowContext_android.cpp
index 12c12a7218..944865909b 100644
--- a/tools/viewer/sk_app/android/GLWindowContext_android.cpp
+++ b/tools/viewer/sk_app/android/GLWindowContext_android.cpp
@@ -6,11 +6,11 @@
* found in the LICENSE file.
*/
-#include <GLES/gl.h>
-
-#include "WindowContextFactory_android.h"
-#include "../GLWindowContext.h"
#include <EGL/egl.h>
+#include <GLES/gl.h>
+#include "../GLWindowContext.h"
+#include "WindowContextFactory_android.h"
+#include "gl/GrGLInterface.h"
using sk_app::GLWindowContext;
using sk_app::DisplayParams;
@@ -25,7 +25,7 @@ public:
void onSwapBuffers() override;
- void onInitializeContext() override;
+ sk_sp<const GrGLInterface> onInitializeContext() override;
void onDestroyContext() override;
private:
@@ -57,7 +57,7 @@ GLWindowContext_android::~GLWindowContext_android() {
this->destroyContext();
}
-void GLWindowContext_android::onInitializeContext() {
+sk_sp<const GrGLInterface> GLWindowContext_android::onInitializeContext() {
fWidth = ANativeWindow_getWidth(fNativeWindow);
fHeight = ANativeWindow_getHeight(fNativeWindow);
@@ -131,6 +131,8 @@ void GLWindowContext_android::onInitializeContext() {
eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_STENCIL_SIZE, &fStencilBits);
eglGetConfigAttrib(fDisplay, surfaceConfig, EGL_SAMPLES, &fSampleCount);
+
+ return sk_sp<const GrGLInterface>(GrGLCreateNativeInterface());
}
void GLWindowContext_android::onDestroyContext() {