From 913ba6fed110dc7d26232dfdbed4cf5b5012e62b Mon Sep 17 00:00:00 2001 From: baldurk Date: Mon, 20 Feb 2017 13:22:56 +0000 Subject: [PATCH] Don't erase VendorCheck in unrelated function, resetting them to false --- renderdoc/driver/gl/gl_common.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/renderdoc/driver/gl/gl_common.cpp b/renderdoc/driver/gl/gl_common.cpp index 5fb0a7247..ae46c48eb 100644 --- a/renderdoc/driver/gl/gl_common.cpp +++ b/renderdoc/driver/gl/gl_common.cpp @@ -28,8 +28,8 @@ #include "serialise/string_utils.h" #include "gl_driver.h" -bool HasExt[GLExtension_Count]; -bool VendorCheck[VendorCheck_Count]; +bool HasExt[GLExtension_Count] = {}; +bool VendorCheck[VendorCheck_Count] = {}; int GLCoreVersion = 0; bool GLIsCore = false; @@ -375,7 +375,6 @@ void CheckExtensions(const GLHookSet &gl) gl.glGetIntegerv(eGL_NUM_EXTENSIONS, &numExts); RDCEraseEl(HasExt); - RDCEraseEl(VendorCheck); if(gl.glGetString) { @@ -424,6 +423,8 @@ void DoVendorChecks(const GLHookSet &gl, GLPlatform &platform, GLWindowingData c // vertex buffer which is exactly what we wanted from GL_VERTEX_BINDING_BUFFER! // see: http://devgurus.amd.com/message/1306745#1306745 + RDCEraseEl(VendorCheck); + if(gl.glGetError && gl.glGetIntegeri_v) { // clear all error flags.