diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-16 10:44:11 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 17:02:45 +0000 |
| commit | 1f9ed8501b0007846b3032f4bfc38aee98c175a1 (patch) | |
| tree | a342137e34180a110d1cd4129650a771290d0f17 /src/gpu/gl | |
| parent | 20df20cfe822f613d6035baf5f5415a3a977e709 (diff) | |
Move resourceProvider accessor to GrContextPriv
Change-Id: I5cddd620a7ec4b006b7359864ede58e9d4dd684e
Reviewed-on: https://skia-review.googlesource.com/94340
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/gl')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index 0e6eee46d0..f906773efc 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -9,6 +9,7 @@ #include "GrAutoLocaleSetter.h" #include "GrContext.h" +#include "GrContextPriv.h" #include "GrCoordTransform.h" #include "GrGLProgramBuilder.h" #include "GrProgramDesc.h" @@ -32,7 +33,11 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, GrProgramDesc* desc, GrGLGpu* gpu) { - SkASSERT(!pipeline.isBad() && primProc.instantiate(gpu->getContext()->resourceProvider())); +#ifdef SK_DEBUG + GrResourceProvider* resourceProvider = gpu->getContext()->contextPriv().resourceProvider(); + + SkASSERT(!pipeline.isBad() && primProc.instantiate(resourceProvider)); +#endif ATRACE_ANDROID_FRAMEWORK("Shader Compile"); GrAutoLocaleSetter als("C"); |