From 9d1c6748f594b90836d3aded3ffd15bc3c6461a5 Mon Sep 17 00:00:00 2001 From: SmileTheory Date: Tue, 8 Aug 2017 20:20:11 -0700 Subject: [PATCH] OpenGL2: Force VAO usage on OpenGL 3.0+ --- code/renderergl2/tr_extensions.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/code/renderergl2/tr_extensions.c b/code/renderergl2/tr_extensions.c index 8447608e..e90f5189 100644 --- a/code/renderergl2/tr_extensions.c +++ b/code/renderergl2/tr_extensions.c @@ -112,9 +112,17 @@ void GLimp_InitExtraExtensions() // OpenGL 3.0 - GL_ARB_vertex_array_object extension = "GL_ARB_vertex_array_object"; glRefConfig.vertexArrayObject = qfalse; - if (SDL_GL_ExtensionSupported(extension)) + if (q_gl_version_at_least_3_0 || SDL_GL_ExtensionSupported(extension)) { - glRefConfig.vertexArrayObject = !!r_arb_vertex_array_object->integer; + if (q_gl_version_at_least_3_0) + { + // force VAO, core context requires it + glRefConfig.vertexArrayObject = qtrue; + } + else + { + glRefConfig.vertexArrayObject = !!r_arb_vertex_array_object->integer; + } QGL_ARB_vertex_array_object_PROCS;