diff options
| author |  Robert Phillips <robertphillips@google.com> | 2017-08-29 14:46:43 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-08-30 11:30:32 +0000 |
| commit | fb4a20c7f54110d6c43dee4b78801c163ad6c8f3 (patch) | |
| tree | 47c075f8a37b9d9e1b1c7504ccd539020d0dd399 /src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp | |
| parent | 73fa972d0bd9de7cb801323495b5d1fabd31b24f (diff) | |
Remove kDefault_GrSurfaceOrigin
Change-Id: Ic55d488287add32e5a32b5a77415e16cebf4c1ee
Reviewed-on: https://skia-review.googlesource.com/29120
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp')
| -rw-r--r-- | src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp index afbfa09a62..7e6b8f771c 100644 --- a/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp +++ b/src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp @@ -72,10 +72,10 @@ static const char* specific_layout_qualifier_name(GrBlendEquation equation) { uint8_t GrGLSLFragmentShaderBuilder::KeyForSurfaceOrigin(GrSurfaceOrigin origin) { SkASSERT(kTopLeft_GrSurfaceOrigin == origin || kBottomLeft_GrSurfaceOrigin == origin); - return origin; + return origin + 1; - GR_STATIC_ASSERT(1 == kTopLeft_GrSurfaceOrigin); - GR_STATIC_ASSERT(2 == kBottomLeft_GrSurfaceOrigin); + GR_STATIC_ASSERT(0 == kTopLeft_GrSurfaceOrigin); + GR_STATIC_ASSERT(1 == kBottomLeft_GrSurfaceOrigin); } GrGLSLFragmentShaderBuilder::GrGLSLFragmentShaderBuilder(GrGLSLProgramBuilder* program) @@ -272,10 +272,10 @@ const char* GrGLSLFragmentShaderBuilder::getSecondaryColorOutputName() const { GrSurfaceOrigin GrGLSLFragmentShaderBuilder::getSurfaceOrigin() const { SkASSERT(fProgramBuilder->header().fSurfaceOriginKey); - return static_cast<GrSurfaceOrigin>(fProgramBuilder->header().fSurfaceOriginKey); + return static_cast<GrSurfaceOrigin>(fProgramBuilder->header().fSurfaceOriginKey-1); - GR_STATIC_ASSERT(1 == kTopLeft_GrSurfaceOrigin); - GR_STATIC_ASSERT(2 == kBottomLeft_GrSurfaceOrigin); + GR_STATIC_ASSERT(0 == kTopLeft_GrSurfaceOrigin); + GR_STATIC_ASSERT(1 == kBottomLeft_GrSurfaceOrigin); } void GrGLSLFragmentShaderBuilder::onFinalize() { |