Support ARB extensions for indirect drawing

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 "gl/GrGLAssembleInterface.h"
 #include "GrGLUtil.h"
@@ skipping 126 matching lines @@
     GET_PROC(DrawBuffer);
     GET_PROC(DrawBuffers);
     GET_PROC(DrawElements);
 
     if (glVer >= GR_GL_VER(3,1) || extensions.has("GL_ARB_draw_instanced") ||
         extensions.has("GL_EXT_draw_instanced")) {
         GET_PROC(DrawArraysInstanced);
         GET_PROC(DrawElementsInstanced);
     }
 
-    if (glVer >= GR_GL_VER(4,0)) {
-        // We don't use ARB_draw_indirect because it does not support a base instance.
+    if (glVer >= GR_GL_VER(4,0) || extensions.has("GL_ARB_draw_indirect")) {
         GET_PROC(DrawArraysIndirect);
         GET_PROC(DrawElementsIndirect);
     }
 
     GET_PROC(Enable);
     GET_PROC(EnableVertexAttribArray);
     GET_PROC(EndQuery);
     GET_PROC(Finish);
     GET_PROC(Flush);
     GET_PROC(FrontFace);
@@ skipping 24 matching lines @@
     GET_PROC(GetStringi);
     GET_PROC(GetShaderPrecisionFormat);
     GET_PROC(GetTexLevelParameteriv);
     GET_PROC(GenQueries);
     GET_PROC(GenTextures);
     GET_PROC(GetUniformLocation);
     GET_PROC(IsTexture);
     GET_PROC(LineWidth);
     GET_PROC(LinkProgram);
     GET_PROC(MapBuffer);
+
+    if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_ARB_multi_draw_indirect")) {
+        GET_PROC(MultiDrawArraysIndirect);
+        GET_PROC(MultiDrawElementsIndirect);
+    }
+
     GET_PROC(PixelStorei);
     if (extensions.has("GL_EXT_raster_multisample")) {
         GET_PROC_SUFFIX(RasterSamples, EXT);
     }
     GET_PROC(ReadBuffer);
     GET_PROC(ReadPixels);
     GET_PROC(Scissor);
     GET_PROC(ShaderSource);
     GET_PROC(StencilFunc);
     GET_PROC(StencilFuncSeparate);
@@ skipping 158 matching lines @@
         GET_PROC(InvalidateFramebuffer);
         GET_PROC(InvalidateSubFramebuffer);
         GET_PROC(InvalidateTexImage);
         GET_PROC(InvalidateTexSubImage);
     }
 
     if (glVer >= GR_GL_VER(4,3) || extensions.has("GL_ARB_program_interface_query")) {
         GET_PROC(GetProgramResourceLocation);
     }
 
-    if (glVer >= GR_GL_VER(4,3)) {
-        // We don't use ARB_multi_draw_indirect because it does not support GL_DRAW_INDIRECT_BUFFER.
-        GET_PROC(MultiDrawArraysIndirect);
-        GET_PROC(MultiDrawElementsIndirect);
-    }
-
     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);
         GET_PROC_SUFFIX(IsTextureHandleResident, NV);
         GET_PROC_SUFFIX(IsImageHandleResident, NV);
@@ skipping 246 matching lines @@
     GET_PROC(GetProgramiv);
     GET_PROC(GetShaderInfoLog);
     GET_PROC(GetShaderPrecisionFormat);
     GET_PROC(GetShaderiv);
     GET_PROC(GetString);
     GET_PROC(GetStringi);
     GET_PROC(GetUniformLocation);
     GET_PROC(IsTexture);
     GET_PROC(LineWidth);
     GET_PROC(LinkProgram);
+
+    if (extensions.has("GL_EXT_multi_draw_indirect")) {
+        GET_PROC_SUFFIX(MultiDrawArraysIndirect, EXT);
+        GET_PROC_SUFFIX(MultiDrawElementsIndirect, EXT);
+    }
+
     GET_PROC(PixelStorei);
 
     if (extensions.has("GL_EXT_raster_multisample")) {
         GET_PROC_SUFFIX(RasterSamples, EXT);
     }
 
     GET_PROC(ReadPixels);
     GET_PROC(Scissor);
     GET_PROC(ShaderSource);
     GET_PROC(StencilFunc);
@@ skipping 194 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 (extensions.has("GL_EXT_multi_draw_indirect")) {
-        GET_PROC_SUFFIX(MultiDrawArraysIndirect, EXT);
-        GET_PROC_SUFFIX(MultiDrawElementsIndirect, 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);
         GET_PROC_SUFFIX(IsTextureHandleResident, NV);
         GET_PROC_SUFFIX(IsImageHandleResident, NV);
@@ skipping 32 matching lines @@
 
     if (extensions.has("GL_OES_sample_shading")) {
         GET_PROC_SUFFIX(MinSampleShading, OES);
     }
 
     interface->fStandard = kGLES_GrGLStandard;
     interface->fExtensions.swap(&extensions);
 
     return interface;
 }