| Index: gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
|
| diff --git a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
|
| index e9ca9868d1623eb437d84d203fd151933390b7cf..d0d9d08b3b95459166a7b6bcc06e988cccfbd219 100644
|
| --- a/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
|
| +++ b/gpu/skia_bindings/gl_bindings_skia_cmd_buffer.cc
|
| @@ -23,10 +23,12 @@ namespace skia_bindings {
|
|
|
| sk_sp<GrGLInterface> CreateGLES2InterfaceBindings(GLES2Interface* impl) {
|
| sk_sp<GrGLInterface> interface(new GrGLInterface);
|
| +
|
| interface->fStandard = kGLES_GrGLStandard;
|
| - interface->fExtensions.init(
|
| - kGLES_GrGLStandard, gles_bind(&GLES2Interface::GetString, impl), nullptr,
|
| - gles_bind(&GLES2Interface::GetIntegerv, impl));
|
| + interface->fExtensions.init(kGLES_GrGLStandard,
|
| + gles_bind(&GLES2Interface::GetString, impl),
|
| + gles_bind(&GLES2Interface::GetStringi, impl),
|
| + gles_bind(&GLES2Interface::GetIntegerv, impl));
|
|
|
| GrGLInterface::Functions* functions = &interface->fFunctions;
|
| functions->fActiveTexture = gles_bind(&GLES2Interface::ActiveTexture, impl);
|
| @@ -67,13 +69,23 @@ sk_sp<GrGLInterface> CreateGLES2InterfaceBindings(GLES2Interface* impl) {
|
| gles_bind(&GLES2Interface::DisableVertexAttribArray, impl);
|
| functions->fDiscardFramebuffer =
|
| gles_bind(&GLES2Interface::DiscardFramebufferEXT, impl);
|
| + functions->fInvalidateFramebuffer =
|
| + gles_bind(&GLES2Interface::InvalidateFramebuffer, impl);
|
| + functions->fInvalidateSubFramebuffer =
|
| + gles_bind(&GLES2Interface::InvalidateSubFramebuffer, impl);
|
| functions->fDrawArrays = gles_bind(&GLES2Interface::DrawArrays, impl);
|
| + functions->fDrawArraysInstanced =
|
| + gles_bind(&GLES2Interface::DrawArraysInstancedANGLE, impl);
|
| functions->fDrawElements = gles_bind(&GLES2Interface::DrawElements, impl);
|
| + functions->fDrawElementsInstanced =
|
| + gles_bind(&GLES2Interface::DrawElementsInstancedANGLE, impl);
|
| functions->fEnable = gles_bind(&GLES2Interface::Enable, impl);
|
| functions->fEnableVertexAttribArray =
|
| gles_bind(&GLES2Interface::EnableVertexAttribArray, impl);
|
| functions->fFinish = gles_bind(&GLES2Interface::Finish, impl);
|
| functions->fFlush = gles_bind(&GLES2Interface::Flush, impl);
|
| + // functions->fFlushMappedBufferRange =
|
| + // gles_bind(&GLES2Interface::FlushMappedBufferRange, impl);
|
| functions->fFrontFace = gles_bind(&GLES2Interface::FrontFace, impl);
|
| functions->fGenBuffers = gles_bind(&GLES2Interface::GenBuffers, impl);
|
| functions->fGenTextures = gles_bind(&GLES2Interface::GenTextures, impl);
|
| @@ -92,12 +104,14 @@ sk_sp<GrGLInterface> CreateGLES2InterfaceBindings(GLES2Interface* impl) {
|
| functions->fGetShaderPrecisionFormat =
|
| gles_bind(&GLES2Interface::GetShaderPrecisionFormat, impl);
|
| functions->fGetString = gles_bind(&GLES2Interface::GetString, impl);
|
| + functions->fGetStringi = gles_bind(&GLES2Interface::GetStringi, impl);
|
| functions->fGetUniformLocation =
|
| gles_bind(&GLES2Interface::GetUniformLocation, impl);
|
| functions->fInsertEventMarker =
|
| gles_bind(&GLES2Interface::InsertEventMarkerEXT, impl);
|
| functions->fLineWidth = gles_bind(&GLES2Interface::LineWidth, impl);
|
| functions->fLinkProgram = gles_bind(&GLES2Interface::LinkProgram, impl);
|
| + functions->fMapBufferRange = gles_bind(&GLES2Interface::MapBufferRange, impl);
|
| functions->fMapBufferSubData =
|
| gles_bind(&GLES2Interface::MapBufferSubDataCHROMIUM, impl);
|
| functions->fMapTexSubImage2D =
|
| @@ -158,8 +172,12 @@ sk_sp<GrGLInterface> CreateGLES2InterfaceBindings(GLES2Interface* impl) {
|
| gles_bind(&GLES2Interface::VertexAttrib3fv, impl);
|
| functions->fVertexAttrib4fv =
|
| gles_bind(&GLES2Interface::VertexAttrib4fv, impl);
|
| + functions->fVertexAttribDivisor =
|
| + gles_bind(&GLES2Interface::VertexAttribDivisorANGLE, impl);
|
| functions->fVertexAttribPointer =
|
| gles_bind(&GLES2Interface::VertexAttribPointer, impl);
|
| + functions->fVertexAttribIPointer =
|
| + gles_bind(&GLES2Interface::VertexAttribIPointer, impl);
|
| functions->fViewport = gles_bind(&GLES2Interface::Viewport, impl);
|
| functions->fBindFramebuffer =
|
| gles_bind(&GLES2Interface::BindFramebuffer, impl);
|
|
|