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

Rename gl_init_vao to gl_check_vao

This commit is contained in:
twinaphex 2016-05-16 06:14:32 +02:00
parent 1983604134
commit cda8e7b560
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gfx/drivers/gl.c
View File

@ -208,7 +208,7 @@ static bool gl_check_mipmap(void)
} }
#ifndef HAVE_OPENGLES #ifndef HAVE_OPENGLES
static bool gl_init_vao(gl_t *gl) static bool gl_check_vao(void)
{ {
if (!gl_core_context && !gl_query_extension("ARB_vertex_array_object")) if (!gl_core_context && !gl_query_extension("ARB_vertex_array_object"))
return false; return false;
@ -216,7 +216,6 @@ static bool gl_init_vao(gl_t *gl)
if (!(glGenVertexArrays && glBindVertexArray && glDeleteVertexArrays)) if (!(glGenVertexArrays && glBindVertexArray && glDeleteVertexArrays))
return false; return false;
glGenVertexArrays(1, &gl->vao);
return true; return true;
} }
#endif #endif
@ -2207,11 +2206,12 @@ static bool resolve_extensions(gl_t *gl, const char *context_ident)
if (gl_core_context) if (gl_core_context)
{ {
RARCH_LOG("[GL]: Using Core GL context.\n"); RARCH_LOG("[GL]: Using Core GL context.\n");
if (!gl_init_vao(gl)) if (!gl_check_vao())
{ {
RARCH_ERR("[GL]: Failed to initialize VAOs.\n"); RARCH_ERR("[GL]: Failed to initialize VAOs.\n");
return false; return false;
} }
glGenVertexArrays(1, &gl->vao);
} }
if (version && sscanf(version, "%u.%u", &major, &minor) != 2) if (version && sscanf(version, "%u.%u", &major, &minor) != 2)