From 9ea5291c484dd9f6ccb75d830d2a7512b76d2692 Mon Sep 17 00:00:00 2001 From: Camilla Berglund Date: Fri, 16 Oct 2015 05:02:48 +0200 Subject: [PATCH] Simplify glad --- deps/glad.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/deps/glad.c b/deps/glad.c index cec08bb3..a0268a61 100644 --- a/deps/glad.c +++ b/deps/glad.c @@ -6,10 +6,8 @@ struct gladGLversionStruct GLVersion; static int has_ext(const char *ext) { -#if defined(GL_ES_VERSION_3_0) - if(!GLAD_GL_ES_VERSION_3_0) { -#elif defined(GL_VERSION_3_0) - if(!GLAD_GL_VERSION_3_0) { +#if defined(GL_VERSION_3_0) || defined(GL_ES_VERSION_3_0) + if(glGetStringi == NULL) { #endif const char *extensions; const char *loc; @@ -32,7 +30,7 @@ static int has_ext(const char *ext) { } extensions = terminator; } -#if defined(GL_ES_VERSION_3_0) || defined(GL_VERSION_3_0) +#if defined(GL_VERSION_3_0) || defined(GL_ES_VERSION_3_0) } else { GLint num_exts, index;