From edbfdfb7794c0888dac3f98d46503b81eebaae8f Mon Sep 17 00:00:00 2001 From: baldurk Date: Fri, 29 Jun 2018 17:10:07 +0100 Subject: [PATCH] Ensure that local EGL headers include our platform headers, not system --- renderdoc/driver/gl/official/egl.h | 6 +++--- renderdoc/driver/gl/official/eglext.h | 2 +- renderdoc/driver/gl/official/eglplatform.h | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/renderdoc/driver/gl/official/egl.h b/renderdoc/driver/gl/official/egl.h index 2d8b6f704..b73f7c74a 100644 --- a/renderdoc/driver/gl/official/egl.h +++ b/renderdoc/driver/gl/official/egl.h @@ -36,7 +36,7 @@ extern "C" { ** Khronos $Revision$ on $Date$ */ -#include +#include "eglplatform.h" /* Generated on date 20170203 */ @@ -53,8 +53,8 @@ extern "C" { #define EGL_VERSION_1_0 1 typedef unsigned int EGLBoolean; typedef void *EGLDisplay; -#include -#include +#include "eglplatform.h" +#include "khrplatform.h" typedef void *EGLConfig; typedef void *EGLSurface; typedef void *EGLContext; diff --git a/renderdoc/driver/gl/official/eglext.h b/renderdoc/driver/gl/official/eglext.h index 008fa76e7..5a7354eec 100644 --- a/renderdoc/driver/gl/official/eglext.h +++ b/renderdoc/driver/gl/official/eglext.h @@ -36,7 +36,7 @@ extern "C" { ** Khronos $Revision$ on $Date$ */ -#include +#include "eglplatform.h" #define EGL_EGLEXT_VERSION 20170203 diff --git a/renderdoc/driver/gl/official/eglplatform.h b/renderdoc/driver/gl/official/eglplatform.h index 7041b2fa5..4854f097e 100644 --- a/renderdoc/driver/gl/official/eglplatform.h +++ b/renderdoc/driver/gl/official/eglplatform.h @@ -34,7 +34,7 @@ * by filing a bug against product "EGL" component "Registry". */ -#include +#include "khrplatform.h" /* Macros used in EGL function prototype declarations. *