From 341d0f999840a38444be5bf785fa1ffbed080945 Mon Sep 17 00:00:00 2001
From: twinaphex <libretro@gmail.com>
Date: Wed, 9 Mar 2016 12:00:45 +0100
Subject: [PATCH] Update

---
 libretro-common/glsm/glsm.c            | 7 +++++++
 libretro-common/include/glsm/glsm.h    | 2 ++
 libretro-common/include/glsm/glsmsym.h | 8 +++++++-
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/libretro-common/glsm/glsm.c b/libretro-common/glsm/glsm.c
index b4ee0cb26e..4ad065290c 100644
--- a/libretro-common/glsm/glsm.c
+++ b/libretro-common/glsm/glsm.c
@@ -31,7 +31,9 @@ struct gl_cached_state
       GLuint ids[MAX_TEXTURE];
    } bind_textures;
 
+#ifndef HAVE_OPENGLES
    GLenum colorlogicop;
+#endif
 
    struct
    {
@@ -724,7 +726,10 @@ static void glsm_state_setup(void)
    gl_state.cap_translate[SGL_ALPHA_TEST]           = GL_ALPHA_TEST;
    gl_state.cap_translate[SGL_SCISSOR_TEST]         = GL_SCISSOR_TEST;
    gl_state.cap_translate[SGL_STENCIL_TEST]         = GL_STENCIL_TEST;
+
+#ifndef HAVE_OPENGLES
    gl_state.cap_translate[SGL_COLOR_LOGIC_OP]       = GL_COLOR_LOGIC_OP;
+#endif
 
    for (i = 0; i < MAX_ATTRIB; i++)
       gl_state.vertex_attrib_pointer.enabled[i] = 0;
@@ -751,7 +756,9 @@ static void glsm_state_setup(void)
 
    gl_state.depthfunc.func              = GL_LESS;
 
+#ifndef HAVE_OPENGLES
    gl_state.colorlogicop                = GL_COPY;
+#endif
 
 #ifdef CORE
    glGenVertexArrays(1, &gl_state.vao);
diff --git a/libretro-common/include/glsm/glsm.h b/libretro-common/include/glsm/glsm.h
index 6da4583825..940433cd98 100644
--- a/libretro-common/include/glsm/glsm.h
+++ b/libretro-common/include/glsm/glsm.h
@@ -100,7 +100,9 @@ enum
    SGL_DITHER,
    SGL_SAMPLE_ALPHA_TO_COVERAGE,
    SGL_SAMPLE_COVERAGE,
+#ifndef HAVE_OPENGLES
    SGL_COLOR_LOGIC_OP,
+#endif
    SGL_CAP_MAX
 };
 
diff --git a/libretro-common/include/glsm/glsmsym.h b/libretro-common/include/glsm/glsmsym.h
index ea62c8939a..eac9b36276 100644
--- a/libretro-common/include/glsm/glsmsym.h
+++ b/libretro-common/include/glsm/glsmsym.h
@@ -61,6 +61,7 @@ extern "C" {
 #define glGetProgramiv              rglGetProgramiv
 #define glGetShaderiv               rglGetShaderiv
 #define glAttachShader              rglAttachShader
+#define glDetachShader              rglDetachShader
 #define glShaderSource              rglShaderSource
 #define glCompileShader             rglCompileShader
 #define glCreateProgram             rglCreateProgram
@@ -109,6 +110,8 @@ extern "C" {
 #define glPolygonOffset             rglPolygonOffset
 #define glPixelStorei               rglPixelStorei
 #define glReadBuffer                rglReadBuffer
+#define glUniformMatrix4fv          rglUniformMatrix4fv
+#define glGetAttribLocation         rglGetAttribLocation
 
 void rglReadBuffer(GLenum mode);
 void rglPixelStorei(GLenum pname, GLint param);
@@ -207,7 +210,10 @@ void rglBlitFramebuffer(
       GLint dstX0, GLint dstY0,
       GLint dstX1, GLint dstY1,
       GLbitfield mask, GLenum filter);
-
+void rglDetachShader(GLuint program, GLuint shader);
+void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
+      const GLfloat *value);
+GLint rglGetAttribLocation(GLuint program, const GLchar *name);
 
 #ifdef __cplusplus
 }