mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'a078d40b80103ba083ad04eab625084279e930b3'

Browse Source
This commit is contained in:
twinaphex 2018-06-25 23:55:41 +02:00
commit 0230c2f4d8
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libretro-common/glsm/glsm.c
View File

@ -222,11 +222,10 @@ GLenum rglGetError(void)
* OpenGL : 3.2 * OpenGL : 3.2
* OpenGLES : 3.0 * OpenGLES : 3.0
*/ */
void rglGetInteger64v( GLenum pname, void rglGetInteger64v( GLenum pname, int64_t *data)
GLint64 * data)
{ {
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3) #if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
glGetInteger64v(pname, data); glGetInteger64v(pname, (GLint64*)data);
#endif #endif
} }
@ -2427,6 +2426,23 @@ void rglBufferStorage(GLenum target, GLsizeiptr size, const GLvoid *data, GLbitf
#endif #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: * Core in:

6
libretro-common/include/glsm/glsmsym.h
View File

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