Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-04 21:56:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix pointer related issues and add glfwGetAndroidApp

Browse Source
This commit is contained in:
Curi0 2017-09-27 18:25:49 +05:30
parent 28e66f717a
commit 83c4c2d81a
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/GLFW/glfw3native.h
View File

@ -564,6 +564,10 @@ GLFWAPI int glfwGetOSMesaDepthBuffer(GLFWwindow* window, int* width, int* height
GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* window); GLFWAPI OSMesaContext glfwGetOSMesaContext(GLFWwindow* window);
#endif #endif
#ifdef defined(GLFW_EXPOSE_NATIVE_ANDROID)
GLFWAPI HWND glfwGetAndroidApp(GLFWwindow* window);
#endif
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif

2
src/android_platform.h
View File

@ -63,7 +63,7 @@ typedef struct VkAndroidSurfaceCreateInfoKHR {
VkStructureType sType; VkStructureType sType;
const void* pNext; const void* pNext;
VkAndroidSurfaceCreateFlagsKHR flags; VkAndroidSurfaceCreateFlagsKHR flags;
ANativeWindow* surface; ANativeWindow* window;
} VkAndroidSurfaceCreateInfoKHR; } VkAndroidSurfaceCreateInfoKHR;
typedef VkResult (APIENTRY *PFN_vkCreateAndroidSurfaceKHR)(VkInstance,const VkAndroidSurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*); typedef VkResult (APIENTRY *PFN_vkCreateAndroidSurfaceKHR)(VkInstance,const VkAndroidSurfaceCreateInfoKHR*,const VkAllocationCallbacks*,VkSurfaceKHR*);

17
src/android_window.c
View File

@ -39,7 +39,7 @@ struct engine engine;
void android_main(struct android_app *app) { void android_main(struct android_app *app) {
memset(&engine, 0, sizeof(engine)); memset(&engine, 0, sizeof(engine));
app->userData = &engine; app->userData = &engine;
engine.app = app; engine.app = &app;
glfwMain(); glfwMain();
@ -53,7 +53,7 @@ int _glfwPlatformCreateWindow(_GLFWwindow* window,
const _GLFWctxconfig* ctxconfig, const _GLFWctxconfig* ctxconfig,
const _GLFWfbconfig* fbconfig) const _GLFWfbconfig* fbconfig)
{ {
window->android.app = engine.app; window->android.app = &engine.app;
if (ctxconfig->client != GLFW_NO_API) if (ctxconfig->client != GLFW_NO_API)
{ {
if (ctxconfig->source == GLFW_EGL_CONTEXT_API) if (ctxconfig->source == GLFW_EGL_CONTEXT_API)
@ -312,7 +312,7 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
memset(&sci, 0, sizeof(sci)); memset(&sci, 0, sizeof(sci));
sci.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR; sci.sType = VK_STRUCTURE_TYPE_ANDROID_SURFACE_CREATE_INFO_KHR;
sci.surface = window->android.app->window; sci.window = &window->android.app->window;
err = vkCreateAndroidSurfaceKHR(instance, &sci, allocator, surface); err = vkCreateAndroidSurfaceKHR(instance, &sci, allocator, surface);
if (err) if (err)
@ -325,3 +325,14 @@ VkResult _glfwPlatformCreateWindowSurface(VkInstance instance,
return err; return err;
} }
//////////////////////////////////////////////////////////////////////////
////// GLFW native API //////
//////////////////////////////////////////////////////////////////////////
GLFWAPI struct android_app * glfwGetAndroidApp(GLFWwindow* handle)
{
_GLFWwindow* window = (_GLFWwindow*) handle;
_GLFW_REQUIRE_INIT_OR_RETURN(NULL);
return window->android.app;
}