| Index: src/gpu/gl/GrGLGpu.cpp
|
| diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp
|
| index 3a3b833a8f6f741067913f245f4e7848df2bb308..07aaaae26b5c1b4288bb6f0c1a985f8268f436ce 100644
|
| --- a/src/gpu/gl/GrGLGpu.cpp
|
| +++ b/src/gpu/gl/GrGLGpu.cpp
|
| @@ -157,8 +157,7 @@
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -GrGpu* GrGLGpu::Create(GrBackendContext backendContext, const GrContextOptions& options,
|
| - GrContext* context) {
|
| +GrGpu* GrGLGpu::Create(GrBackendContext backendContext, GrContext* context) {
|
| SkAutoTUnref<const GrGLInterface> glInterface(
|
| reinterpret_cast<const GrGLInterface*>(backendContext));
|
| if (!glInterface) {
|
| @@ -169,7 +168,7 @@
|
| if (!glInterface) {
|
| return NULL;
|
| }
|
| - GrGLContext* glContext = GrGLContext::Create(glInterface, options);
|
| + GrGLContext* glContext = GrGLContext::Create(glInterface);
|
| if (glContext) {
|
| return SkNEW_ARGS(GrGLGpu, (glContext, context));
|
| }
|
| @@ -1437,7 +1436,7 @@
|
|
|
| fCurrentProgram.reset(fProgramCache->getProgram(args));
|
| if (NULL == fCurrentProgram.get()) {
|
| - GrCapsDebugf(this->caps(), "Failed to create program!\n");
|
| + GrContextDebugf(this->getContext(), "Failed to create program!\n");
|
| return false;
|
| }
|
|
|
|
|