Fixup GL instanced rendering commands

src/gpu/gl/GrGLAssembleInterface.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "GrGLAssembleInterface.h"
@@ skipping 761 matching lines @@
         GET_PROC_SUFFIX(BindFragmentInputLocation, CHROMIUM);
     }
 
     if (extensions.has("GL_NV_framebuffer_mixed_samples")) {
         GET_PROC_SUFFIX(CoverageModulation, NV);
     }
     if (extensions.has("GL_CHROMIUM_framebuffer_mixed_samples")) {
         GET_PROC_SUFFIX(CoverageModulation, CHROMIUM);
     }
 
-    if (version >= GR_GL_VER(3,0) || extensions.has("GL_EXT_draw_instanced")) {
+    if (version >= GR_GL_VER(3,0)) {
         GET_PROC(DrawArraysInstanced);
         GET_PROC(DrawElementsInstanced);
+    } else if (extensions.has("GL_EXT_draw_instanced")) {
+        GET_PROC_SUFFIX(DrawArraysInstanced, EXT);
+        GET_PROC_SUFFIX(DrawElementsInstanced, EXT);
     }
 
-    if (version >= GR_GL_VER(3,0) || extensions.has("GL_EXT_instanced_arrays")) {
+    if (version >= GR_GL_VER(3,0)) {
         GET_PROC(VertexAttribDivisor);
+    } else if (extensions.has("GL_EXT_instanced_arrays")) {
+        GET_PROC_SUFFIX(VertexAttribDivisor, EXT);
     }
 
     if (extensions.has("GL_NV_bindless_texture")) {
         GET_PROC_SUFFIX(GetTextureHandle, NV);
         GET_PROC_SUFFIX(GetTextureSamplerHandle, NV);
         GET_PROC_SUFFIX(MakeTextureHandleResident, NV);
         GET_PROC_SUFFIX(MakeTextureHandleNonResident, NV);
         GET_PROC_SUFFIX(GetImageHandle, NV);
         GET_PROC_SUFFIX(MakeImageHandleResident, NV);
         GET_PROC_SUFFIX(MakeImageHandleNonResident, NV);
@@ skipping 30 matching lines @@
     if (extensions.has("EGL_KHR_image") || extensions.has("EGL_KHR_image_base")) {
         GET_EGL_PROC_SUFFIX(CreateImage, KHR);
         GET_EGL_PROC_SUFFIX(DestroyImage, KHR);
     }
 
     interface->fStandard = kGLES_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
     return interface;
 }