From 04c24ad8559ba95cd52d10561b3922d6b6fa75c6 Mon Sep 17 00:00:00 2001 From: baldurk Date: Tue, 17 Jan 2017 20:00:37 +0000 Subject: [PATCH] Variable shadowing compile fix --- renderdoc/driver/gl/gl_replay_linux.cpp | 6 +++--- renderdoc/driver/gl/gl_replay_win32.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/renderdoc/driver/gl/gl_replay_linux.cpp b/renderdoc/driver/gl/gl_replay_linux.cpp index db3a03297..e8073e443 100644 --- a/renderdoc/driver/gl/gl_replay_linux.cpp +++ b/renderdoc/driver/gl/gl_replay_linux.cpp @@ -365,12 +365,12 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr { X11ErrorHandler prev = XSetErrorHandler(&NonFatalX11ErrorHandler); - for(size_t i = 0; i < ARRAY_COUNT(versions); i++) + for(size_t v = 0; v < ARRAY_COUNT(versions); v++) { X11ErrorSeen = false; - major = versions[i].major; - minor = versions[i].minor; + major = versions[v].major; + minor = versions[v].minor; ctx = glXCreateContextAttribsProc(dpy, fbcfg[0], 0, true, attribs); if(ctx && !X11ErrorSeen) diff --git a/renderdoc/driver/gl/gl_replay_win32.cpp b/renderdoc/driver/gl/gl_replay_win32.cpp index 9a0984ba2..555e005b0 100644 --- a/renderdoc/driver/gl/gl_replay_win32.cpp +++ b/renderdoc/driver/gl/gl_replay_win32.cpp @@ -429,10 +429,10 @@ ReplayCreateStatus GL_CreateReplayDevice(const char *logfile, IReplayDriver **dr rc = NULL; - for(size_t i = 0; i < ARRAY_COUNT(versions); i++) + for(size_t v = 0; v < ARRAY_COUNT(versions); v++) { - major = versions[i].major; - minor = versions[i].minor; + major = versions[v].major; + minor = versions[v].minor; rc = createContextAttribs(dc, NULL, attribs); if(rc)