diff options
| author |  Robert Phillips <robertphillips@google.com> | 2018-01-16 15:07:54 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 20:53:28 +0000 |
| commit | 6be756b673b823881e90a2ef68c12b640ddde549 (patch) | |
| tree | f7e09cae44e5d5b3faddef00d9250962eec0e05a /src/gpu/gl/builders | |
| parent | 1ea485fd56a977b4e84b4e82039e8f2487813c1e (diff) | |
Move resourceProvider accessor to GrContextPriv (take 2)
TBR=bsalomon@google.com
Change-Id: I3fd46ebfad0d04b8a2bfa6190f81308f3a6be620
Reviewed-on: https://skia-review.googlesource.com/95121
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>
Diffstat (limited to 'src/gpu/gl/builders')
| -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"); |