From 49ded3c18e8ffc2cc0be9f7271eb480b2133f984 Mon Sep 17 00:00:00 2001
From: Curi0 <curi0minecraft@gmail.com>
Date: Sat, 30 Sep 2017 20:21:18 +0530
Subject: [PATCH] EGL fixes and updated code

---
 src/android_window.c | 7 ++++++-
 src/egl_context.c    | 6 +++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/android_window.c b/src/android_window.c
index bd31e98bf..1fd7e9384 100644
--- a/src/android_window.c
+++ b/src/android_window.c
@@ -83,7 +83,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
 
     if (ctxconfig->client != GLFW_NO_API)
     {
-        if (ctxconfig->source == GLFW_EGL_CONTEXT_API)
+        if (ctxconfig->source == GLFW_NATIVE_CONTEXT_API | GLFW_EGL_CONTEXT_API)
         {
             if (!_glfwInitEGL())
                 return GLFW_FALSE;
@@ -319,6 +319,11 @@ int _glfwPlatformGetPhysicalDevicePresentationSupport(VkInstance instance,
     return GLFW_TRUE;
 }
 
+int _glfwPlatformFramebufferTransparent(_GLFWwindow* window)
+{
+    return GLFW_FALSE;
+}
+
 VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
                                           _GLFWwindow* window,
                                           const VkAllocationCallbacks* allocator,
diff --git a/src/egl_context.c b/src/egl_context.c
index 9fb789f7f..23981c8d6 100644
--- a/src/egl_context.c
+++ b/src/egl_context.c
@@ -630,9 +630,11 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
             "libGLES_CM.dll",
 #elif defined(_GLFW_COCOA)
             "libGLESv1_CM.dylib",
+#elif defined(_GLFW_ANDROID)
+            "libGLESv1_CM.so",
+            "libGLES_CM.so",
 #else
             "libGLESv1_CM.so.1",
-            "libGLES_CM.so.1",
 #endif
             NULL
         };
@@ -647,6 +649,8 @@ GLFWbool _glfwCreateContextEGL(_GLFWwindow* window,
             "libGLESv2.dylib",
 #elif defined(__CYGWIN__)
             "libGLESv2-2.so",
+#elif defined(_GLFW_ANDROID)
+            "libGLESv2.so",
 #else
             "libGLESv2.so.2",
 #endif