From 9bb3e90cde236b5fd1623fc7a56bb73a02ee1a0c Mon Sep 17 00:00:00 2001 From: Krylov Yaroslav Date: Mon, 24 Jun 2019 12:02:30 +0300 Subject: [PATCH] support older EGL headers that require both EGLAPIENTRY and LINUX defined and have another types for EGLNativeDisplayType and EGLNativeWindowType. --- src/egl_context.h | 1 + src/vivante_platform.h | 4 ---- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/egl_context.h b/src/egl_context.h index a361ac2c5..c73847151 100644 --- a/src/egl_context.h +++ b/src/egl_context.h @@ -45,6 +45,7 @@ typedef struct wl_display* EGLNativeDisplayType; typedef struct wl_egl_window* EGLNativeWindowType; #elif defined(_GLFW_VIVANTE) #define EGLAPIENTRY + #define LINUX #include #else #error "No supported EGL platform selected" diff --git a/src/vivante_platform.h b/src/vivante_platform.h index f24ab74f1..f543f3e11 100644 --- a/src/vivante_platform.h +++ b/src/vivante_platform.h @@ -52,10 +52,6 @@ #define _GLFW_PLATFORM_MONITOR_STATE //_GLFWmonitorVivante vivante #define _GLFW_PLATFORM_CURSOR_STATE //_GLFWcursorVivante vivante -// EGL function pointer typedefs -typedef void * EGLNativeDisplayType; -typedef void * EGLNativeWindowType; - typedef EGLNativeDisplayType (EGLAPIENTRY * PFN_fbGetDisplay)(void *context); typedef EGLNativeDisplayType (EGLAPIENTRY * PFN_fbGetDisplayByIndex)(int DisplayIndex); typedef void (EGLAPIENTRY * PFN_fbGetDisplayGeometry)(EGLNativeDisplayType Display, int *Width, int *Height);