diff options
| author |  Hal Canary <halcanary@google.com> | 2018-01-16 18:33:07 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-01-16 18:33:14 +0000 |
| commit | be46e24d57537f7ab6854fcd6f6ec07e2c50495c (patch) | |
| tree | 8a0304af3a4ea0561af8ecced5b645250f0dd55b /src/gpu/gl/builders | |
| parent | 301152cc58e937561dfd6fa93099778fad5b01b3 (diff) | |
Revert "Move resourceProvider accessor to GrContextPriv"
This reverts commit 1f9ed8501b0007846b3032f4bfc38aee98c175a1.
Reason for revert:
1. breaking android roll
2. breaking Build-Debian9-Clang-arm-Release-Android_API26
Original change's description:
> 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>
TBR=egdaniel@google.com,bsalomon@google.com,robertphillips@google.com
Change-Id: I20b2d267c0925f20453b635663654967199a1197
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Reviewed-on: https://skia-review.googlesource.com/94964
Reviewed-by: Hal Canary <halcanary@google.com>
Commit-Queue: Hal Canary <halcanary@google.com>
Diffstat (limited to 'src/gpu/gl/builders')
| -rw-r--r-- | src/gpu/gl/builders/GrGLProgramBuilder.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/gpu/gl/builders/GrGLProgramBuilder.cpp b/src/gpu/gl/builders/GrGLProgramBuilder.cpp index f906773efc..0e6eee46d0 100644 --- a/src/gpu/gl/builders/GrGLProgramBuilder.cpp +++ b/src/gpu/gl/builders/GrGLProgramBuilder.cpp @@ -9,7 +9,6 @@ #include "GrAutoLocaleSetter.h" #include "GrContext.h" -#include "GrContextPriv.h" #include "GrCoordTransform.h" #include "GrGLProgramBuilder.h" #include "GrProgramDesc.h" @@ -33,11 +32,7 @@ GrGLProgram* GrGLProgramBuilder::CreateProgram(const GrPipeline& pipeline, const GrPrimitiveProcessor& primProc, GrProgramDesc* desc, GrGLGpu* gpu) { -#ifdef SK_DEBUG - GrResourceProvider* resourceProvider = gpu->getContext()->contextPriv().resourceProvider(); - - SkASSERT(!pipeline.isBad() && primProc.instantiate(resourceProvider)); -#endif + SkASSERT(!pipeline.isBad() && primProc.instantiate(gpu->getContext()->resourceProvider())); ATRACE_ANDROID_FRAMEWORK("Shader Compile"); GrAutoLocaleSetter als("C"); |