From df1c0bc9b469093186e0480c3406d3512cbbb527 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Sun, 7 Aug 2016 02:49:24 +0200
Subject: [PATCH] Backport changes

---
 libretro-common/glsym/glsym_es3.c              | 2 +-
 libretro-common/include/glsym/glsym.h          | 4 +++-
 libretro-common/include/glsym/rglgen_headers.h | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libretro-common/glsym/glsym_es3.c b/libretro-common/glsym/glsym_es3.c
index a8c0657824..2c824be3b8 100644
--- a/libretro-common/glsym/glsym_es3.c
+++ b/libretro-common/glsym/glsym_es3.c
@@ -1,4 +1,4 @@
-#include "glsym.h"
+#include "glsym/glsym.h"
 #include <stddef.h>
 #define SYM(x) { "gl" #x, &(gl##x) }
 const struct rglgen_sym_map rglgen_symbol_map[] = {
diff --git a/libretro-common/include/glsym/glsym.h b/libretro-common/include/glsym/glsym.h
index 28aaf724cf..4dd7bfd0a2 100644
--- a/libretro-common/include/glsym/glsym.h
+++ b/libretro-common/include/glsym/glsym.h
@@ -26,8 +26,10 @@
 #include "rglgen.h"
 
 #ifndef HAVE_PSGL
-#ifdef HAVE_OPENGLES2
+#if defined(HAVE_OPENGLES2)
 #include "glsym_es2.h"
+#elif defined(HAVE_OPENGLES3)
+#include "glsym_es3.h"
 #else
 #include "glsym_gl.h"
 #endif
diff --git a/libretro-common/include/glsym/rglgen_headers.h b/libretro-common/include/glsym/rglgen_headers.h
index 46195ad655..5a588a3b20 100644
--- a/libretro-common/include/glsym/rglgen_headers.h
+++ b/libretro-common/include/glsym/rglgen_headers.h
@@ -49,7 +49,7 @@
 #include <GL3/gl3ext.h>
 #elif defined(HAVE_OPENGLES3)
 #include <GLES3/gl3.h>
-#include <GLES2/gl2ext.h> /* There are no GLES3 extensions yet. */
+#include <GLES3/gl3ext.h>
 #elif defined(HAVE_OPENGLES2)
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>