From f7abc300a1de6b4d4347220a4b16fdd40da0522a Mon Sep 17 00:00:00 2001 From: VReaperV Date: Tue, 21 Jan 2025 23:15:07 +0300 Subject: [PATCH] Fix backEnd.currentVAO This was previously getting reset in `R_Init()`, so it was always 0 after a map was loaded. This also meant that the call to `glDeleteVertexArrays()` in `RE_Shutdown()` was silently erroring out if a map was loaded (or `vid_restart` used). --- src/engine/renderer/tr_init.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/engine/renderer/tr_init.cpp b/src/engine/renderer/tr_init.cpp index 686592e4e0..7c4491607e 100644 --- a/src/engine/renderer/tr_init.cpp +++ b/src/engine/renderer/tr_init.cpp @@ -341,11 +341,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA return false; } - if( glConfig2.glCoreProfile ) { - glGenVertexArrays( 1, &backEnd.currentVAO ); - glBindVertexArray( backEnd.currentVAO ); - } - glState.tileStep[ 0 ] = TILE_SIZE * ( 1.0f / glConfig.vidWidth ); glState.tileStep[ 1 ] = TILE_SIZE * ( 1.0f / glConfig.vidHeight ); @@ -381,6 +376,11 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA GLSL_InitGPUShaders(); } + if ( glConfig2.glCoreProfile ) { + glGenVertexArrays( 1, &backEnd.currentVAO ); + glBindVertexArray( backEnd.currentVAO ); + } + GL_CheckErrors(); // set default state