Index: src/gpu/gl/GrGLAssembleInterface.cpp |
diff --git a/src/gpu/gl/GrGLAssembleInterface.cpp b/src/gpu/gl/GrGLAssembleInterface.cpp |
index 3a748b24fee09922c4c5bc0a0b7ac2382fb3e827..6b578f34fc7d1e13763d460a4ae40af5f6fef321 100644 |
--- a/src/gpu/gl/GrGLAssembleInterface.cpp |
+++ b/src/gpu/gl/GrGLAssembleInterface.cpp |
@@ -779,13 +779,18 @@ const GrGLInterface* GrGLAssembleGLESInterface(void* ctx, GrGLGetProc get) { |
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")) { |