CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-25 20:25:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "(Apple) Add workarounds for Apple when not using GL core profile"

Browse Source 
This reverts commit 1be3042ef9.
This commit is contained in:
twinaphex 2016-05-16 18:55:06 +02:00
parent 1be3042ef9
commit d2fc91295e
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1668,12 +1668,8 @@ void rglCopyImageSubData( GLuint srcName,
void rglBindVertexArray(GLuint array)
{
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
#if defined(__APPLE__) && !defined(CORE) && defined(GL_APPLE_vertex_array_object) && !defined(GL_ARB_vertex_array_object)
glBindVertexArraysAPPLE(array);
#else
glBindVertexArray(array);
#endif
#endif
}
/*
@ -1686,12 +1682,8 @@ void rglBindVertexArray(GLuint array)
void rglGenVertexArrays(GLsizei n, GLuint *arrays)
{
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
#if defined(__APPLE__) && !defined(CORE) && defined(GL_APPLE_vertex_array_object) && !defined(GL_ARB_vertex_array_object)
glGenVertexArraysAPPLE(n, arrays);
#else
glGenVertexArrays(n, arrays);
#endif
#endif
}
/*
@ -1704,12 +1696,8 @@ void rglGenVertexArrays(GLsizei n, GLuint *arrays)
void rglDeleteVertexArrays(GLsizei n, const GLuint *arrays)
{
#if defined(HAVE_OPENGL) || defined(HAVE_OPENGLES) && defined(HAVE_OPENGLES3)
#if defined(__APPLE__) && !defined(CORE) && defined(GL_APPLE_vertex_array_object) && !defined(GL_ARB_vertex_array_object)
glDeleteVertexArraysAPPLE(n, arrays);
#else
glDeleteVertexArrays(n, arrays);
#endif
#endif
}
/* GLSM-side */
@ -1836,7 +1824,7 @@ static void glsm_state_bind(void)
gl_state.viewport.w,
gl_state.viewport.h);
#ifdef CORE
rglBindVertexArray(gl_state.vao);
glBindVertexArray(gl_state.vao);
#endif
for(i = 0; i < SGL_CAP_MAX; i ++)
{
@ -1876,7 +1864,7 @@ static void glsm_state_unbind(void)
{
unsigned i;
#ifdef CORE
rglBindVertexArray(0);
glBindVertexArray(0);
#endif
for (i = 0; i < SGL_CAP_MAX; i ++)
{