diff --git a/libretro-common/glsm/glsm.c b/libretro-common/glsm/glsm.c
index 570f79fd3d..b4ee0cb26e 100644
--- a/libretro-common/glsm/glsm.c
+++ b/libretro-common/glsm/glsm.c
@@ -31,6 +31,8 @@ struct gl_cached_state
       GLuint ids[MAX_TEXTURE];
    } bind_textures;
 
+   GLenum colorlogicop;
+
    struct
    {
       bool enabled[MAX_ATTRIB];
@@ -516,6 +518,17 @@ void rglGetProgramiv(GLuint shader, GLenum pname, GLint *params)
    glGetProgramiv(shader, pname, params);
 }
 
+void rglUniformMatrix4fv(GLint location, GLsizei count, GLboolean transpose,
+      const GLfloat *value)
+{
+   glUniformMatrix4fv(location, count, transpose, value);
+}
+
+void rglDetachShader(GLuint program, GLuint shader)
+{
+   glDetachShader(program, shader);
+}
+
 void rglGetShaderiv(GLuint shader, GLenum pname, GLint *params)
 {
    glGetShaderiv(shader, pname, params);
@@ -526,6 +539,11 @@ void rglAttachShader(GLuint program, GLuint shader)
    glAttachShader(program, shader);
 }
 
+GLint rglGetAttribLocation(GLuint program, const GLchar *name)
+{
+   return glGetAttribLocation(program, name);
+}
+
 void rglShaderSource(GLuint shader, GLsizei count,
       const GLchar **string, const GLint *length)
 {
@@ -706,6 +724,7 @@ 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;
+   gl_state.cap_translate[SGL_COLOR_LOGIC_OP]       = GL_COLOR_LOGIC_OP;
 
    for (i = 0; i < MAX_ATTRIB; i++)
       gl_state.vertex_attrib_pointer.enabled[i] = 0;
@@ -732,6 +751,8 @@ static void glsm_state_setup(void)
 
    gl_state.depthfunc.func              = GL_LESS;
 
+   gl_state.colorlogicop                = GL_COPY;
+
 #ifdef CORE
    glGenVertexArrays(1, &gl_state.vao);
 #endif
@@ -812,8 +833,6 @@ static void glsm_state_bind(void)
    {
       if (gl_state.cap_state[i])
          glEnable(gl_state.cap_translate[i]);
-      else
-         glDisable(gl_state.cap_translate[i]);
    }
 
    if (gl_state.frontface.used)
@@ -851,7 +870,10 @@ static void glsm_state_unbind(void)
    glBindVertexArray(0);
 #endif
    for (i = 0; i < SGL_CAP_MAX; i ++)
-      glDisable(gl_state.cap_translate[i]);
+   {
+      if (gl_state.cap_state[i])
+         glDisable(gl_state.cap_translate[i]);
+   }
 
    glBlendFunc(GL_ONE, GL_ZERO);