Merge commit 'a078d40b80103ba083ad04eab625084279e930b3'

libretro-common/glsm/glsm.c

@@ -222,11 +222,10 @@ GLenum rglGetError(void)
  * OpenGL    : 3.2
  * OpenGLES  : 3.0
  */
-void rglGetInteger64v(	GLenum pname,
- 	GLint64 * data)
+void rglGetInteger64v(	GLenum pname, int64_t *data)
 {
 #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
-   glGetInteger64v(pname, data);
+   glGetInteger64v(pname, (GLint64*)data);
 #endif
 }
 
@@ -2427,6 +2426,23 @@ void rglBufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitf
 #endif
 }
 
+/*
+ *
+ * Core in:
+ * OpenGL    : 2.0
+ * OpenGLES  : 2.0
+ */
+
+void rglUniform2iv(	GLint location,
+ 	GLsizei count,
+ 	const GLint *value)
+{
+#ifdef GLSM_DEBUG
+   log_cb(RETRO_LOG_INFO, "glUniform2iv.\n");
+#endif
+   glUniform2iv(location, count, value);
+}
+
 /*
  *
  * Core in:

libretro-common/include/glsm/glsmsym.h

@@ -38,6 +38,7 @@ RETRO_BEGIN_DECLS
 #define glBindSampler               rglBindSampler
 #define glSamplerParameteri         rglSamplerParameteri
 #define glGetBufferSubData          rglGetBufferSubData
+#define glUniform2iv                rglUniform2iv
 #define glUniform2uiv               rglUniform2uiv
 #define glTextureView               rglTextureView
 #define glGetQueryObjectuiv         rglGetQueryObjectuiv
@@ -464,7 +465,10 @@ void rglBindSampler(	GLuint unit,
 void rglGenSamplers(	GLsizei n,
  	GLuint *samplers);
 void rglGetInteger64v(	GLenum pname,
- 	GLint64 * data);
+ 	int64_t * data);
+void rglUniform2iv(	GLint location,
+ 	GLsizei count,
+ 	const GLint *value);
 
 RETRO_END_DECLS