From fb4a20c7f54110d6c43dee4b78801c163ad6c8f3 Mon Sep 17 00:00:00 2001 From: Robert Phillips Date: Tue, 29 Aug 2017 14:46:43 -0400 Subject: Remove kDefault_GrSurfaceOrigin Change-Id: Ic55d488287add32e5a32b5a77415e16cebf4c1ee Reviewed-on: https://skia-review.googlesource.com/29120 Commit-Queue: Robert Phillips Reviewed-by: Brian Salomon --- src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/gpu/glsl/GrGLSLFragmentShaderBuilder.cpp') 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(fProgramBuilder->header().fSurfaceOriginKey); + return static_cast(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() { -- cgit v1.2.3