ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update

This commit is contained in:
twinaphex 2016-03-09 12:00:45 +01:00
parent f79418459f
commit 341d0f9998
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -31,7 +31,9 @@ struct gl_cached_state
GLuint ids[MAX_TEXTURE]; GLuint ids[MAX_TEXTURE];
} bind_textures; } bind_textures;
#ifndef HAVE_OPENGLES
GLenum colorlogicop; GLenum colorlogicop;
#endif
struct 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_ALPHA_TEST] = GL_ALPHA_TEST;
gl_state.cap_translate[SGL_SCISSOR_TEST] = GL_SCISSOR_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_STENCIL_TEST] = GL_STENCIL_TEST;
#ifndef HAVE_OPENGLES
gl_state.cap_translate[SGL_COLOR_LOGIC_OP] = GL_COLOR_LOGIC_OP; gl_state.cap_translate[SGL_COLOR_LOGIC_OP] = GL_COLOR_LOGIC_OP;
#endif
for (i = 0; i < MAX_ATTRIB; i++) for (i = 0; i < MAX_ATTRIB; i++)
gl_state.vertex_attrib_pointer.enabled[i] = 0; gl_state.vertex_attrib_pointer.enabled[i] = 0;
@ -751,7 +756,9 @@ static void glsm_state_setup(void)
gl_state.depthfunc.func = GL_LESS; gl_state.depthfunc.func = GL_LESS;
#ifndef HAVE_OPENGLES
gl_state.colorlogicop = GL_COPY; gl_state.colorlogicop = GL_COPY;
#endif
#ifdef CORE #ifdef CORE
glGenVertexArrays(1, &gl_state.vao); glGenVertexArrays(1, &gl_state.vao);

2
libretro-common/include/glsm/glsm.h
View File

@ -100,7 +100,9 @@ enum
SGL_DITHER, SGL_DITHER,
SGL_SAMPLE_ALPHA_TO_COVERAGE, SGL_SAMPLE_ALPHA_TO_COVERAGE,
SGL_SAMPLE_COVERAGE, SGL_SAMPLE_COVERAGE,
#ifndef HAVE_OPENGLES
SGL_COLOR_LOGIC_OP, SGL_COLOR_LOGIC_OP,
#endif
SGL_CAP_MAX SGL_CAP_MAX
}; };

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

@ -61,6 +61,7 @@ extern "C" {
#define glGetProgramiv rglGetProgramiv #define glGetProgramiv rglGetProgramiv
#define glGetShaderiv rglGetShaderiv #define glGetShaderiv rglGetShaderiv
#define glAttachShader rglAttachShader #define glAttachShader rglAttachShader
#define glDetachShader rglDetachShader
#define glShaderSource rglShaderSource #define glShaderSource rglShaderSource
#define glCompileShader rglCompileShader #define glCompileShader rglCompileShader
#define glCreateProgram rglCreateProgram #define glCreateProgram rglCreateProgram
@ -109,6 +110,8 @@ extern "C" {
#define glPolygonOffset rglPolygonOffset #define glPolygonOffset rglPolygonOffset
#define glPixelStorei rglPixelStorei #define glPixelStorei rglPixelStorei
#define glReadBuffer rglReadBuffer #define glReadBuffer rglReadBuffer
#define glUniformMatrix4fv rglUniformMatrix4fv
#define glGetAttribLocation rglGetAttribLocation
void rglReadBuffer(GLenum mode); void rglReadBuffer(GLenum mode);
void rglPixelStorei(GLenum pname, GLint param); void rglPixelStorei(GLenum pname, GLint param);
@ -207,7 +210,10 @@ void rglBlitFramebuffer(
GLint dstX0, GLint dstY0, GLint dstX0, GLint dstY0,
GLint dstX1, GLint dstY1, GLint dstX1, GLint dstY1,
GLbitfield mask, GLenum filter); 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 #ifdef __cplusplus
} }