Fix mesa issues.

src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gl/GrGLExtensions.h"
 #include "gl/GrGLInterface.h"
 #include "../GrGLUtil.h"
 
 #define GL_GLEXT_PROTOTYPES
 #include "osmesa_wrapper.h"
 
 #define GR_GL_GET_PROC(F) interface->f ## F = (GrGL ## F ## Proc) \
         OSMesaGetProcAddress("gl" #F);
 #define GR_GL_GET_PROC_SUFFIX(F, S) interface->f ## F = (GrGL ## F ## Proc) \
         OSMesaGetProcAddress("gl" #F #S);
 
 // We use OSMesaGetProcAddress for every gl function to avoid accidentally using
 // non-Mesa gl functions.
 
 const GrGLInterface* GrGLCreateMesaInterface() {
     if (NULL != OSMesaGetCurrentContext()) {
 
-        GrGLGetStringProc getString =
-            (GrGLGetStringProc) OSMesaGetProcAddress("glGetString");
-        GrGLGetStringiProc glGetStringi =
-            (GrGLGetStringiProc) OSMesaGetProcAddress("glGetStringi");
-        GrGLGetIntegervProc glGetIntegerv =
-        (GrGLGetIntegervProc) OSMesaGetProcAddress("glGetIntegerv");
+        GrGLGetStringProc getString = (GrGLGetStringProc) OSMesaGetProcAddress("glGetString");
+        GrGLGetStringiProc getStringi = (GrGLGetStringiProc) OSMesaGetProcAddress("glGetStringi");
+        GrGLGetIntegervProc getIntegerv =
+            (GrGLGetIntegervProc) OSMesaGetProcAddress("glGetIntegerv");
 
         GrGLExtensions extensions;
-        if (!extensions.init(kDesktop_GrGLBinding, glGetString, glGetStringi, glGetIntegerv)) {
+        if (!extensions.init(kDesktop_GrGLBinding, getString, getStringi, getIntegerv)) {
             return NULL;
         }
 
         const char* versionString = (const char*) getString(GL_VERSION);
         GrGLVersion glVer = GrGLGetVersionFromString(versionString);
 
         if (glVer < GR_GL_VER(1,5)) {
             // We must have array and element_array buffer objects.
             return NULL;
         }
@@ skipping 163 matching lines @@
             delete interface;
             return NULL;
         }
         GR_GL_GET_PROC(BindFragDataLocationIndexed);
         interface->fBindingsExported = kDesktop_GrGLBinding;
         return interface;
     } else {
         return NULL;
     }
 }