| Index: src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp
|
| ===================================================================
|
| --- src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp (revision 10811)
|
| +++ src/gpu/gl/android/GrGLCreateNativeInterface_android.cpp (working copy)
|
| @@ -20,7 +20,14 @@
|
| static SkAutoTUnref<GrGLInterface> glInterface;
|
| if (!glInterface.get()) {
|
| GrGLExtensions extensions;
|
| - if (!extensions.init(kES_GrGLBinding, glGetString, NULL, glGetIntegerv)) {
|
| + GrGLGetStringiProc getStringi;
|
| +#if GL_ES_VERSION_3_0
|
| + getStringi = glGetStringi;
|
| +#else
|
| + getStringi = (GrGLGetStringiProc) eglGetProcAddress("glGetStringi");
|
| +#endif
|
| +
|
| + if (!extensions.init(kES_GrGLBinding, glGetString, getStringi, glGetIntegerv)) {
|
| return NULL;
|
| }
|
| GrGLInterface* interface = new GrGLInterface;
|
| @@ -73,6 +80,7 @@
|
| interface->fGetShaderInfoLog = glGetShaderInfoLog;
|
| interface->fGetShaderiv = glGetShaderiv;
|
| interface->fGetString = glGetString;
|
| + interface->fGetStringi = getStringi; // located above
|
| interface->fGetUniformLocation = glGetUniformLocation;
|
| interface->fLineWidth = glLineWidth;
|
| interface->fLinkProgram = glLinkProgram;
|
|
|