From 793d5888769a7351fc699a31f6caa73bcbcbe338 Mon Sep 17 00:00:00 2001 From: Jari Vetoniemi Date: Sun, 11 Mar 2018 18:24:08 +0200 Subject: android/EGL: Mark ANativeWindow w/ header Remove eglGetDisplay as it's called with NULL anyways (Reimplement if otherwise in some app) In eglCreateWindowSurface, check that our pointer really is ANativeWindow, otherwise try use it as is. --- src/libandroid.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/libandroid.c') diff --git a/src/libandroid.c b/src/libandroid.c index 1d677ae..eff3b3a 100644 --- a/src/libandroid.c +++ b/src/libandroid.c @@ -2,6 +2,7 @@ #include #include #include +#include #include #define GLFW_INCLUDE_NONE @@ -428,6 +429,7 @@ AInputQueue_finishEvent(struct AInputQueue *queue, struct AInputEvent *event, in // ANative struct ANativeWindow { + char header[4]; GLFWwindow *glfw; }; @@ -477,6 +479,8 @@ ANativeWindow_fromSurface(JNIEnv* env, jobject surface) if (!(window = calloc(1, sizeof(*window)))) return NULL; + memcpy(window->header, "andr", sizeof(window->header)); + glfwInit(); fprintf(stderr, "glfw: %s\n", glfwGetVersionString()); glfwSetErrorCallback(glfw_error_cb); -- cgit v1.2.3