commit d5c1f342b359de031c52905a2871fbcdb8b01e52
author Robert Phillips <robertphillips@google.com> Mon Oct 14 09:50:05 2019 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Mon Oct 14 14:18:23 2019 +0000
tree 8361333a8986ec1e19e6f664ef8f0bd054b2011e
parent a4828a13c27a0bbd2a2b9169916a0b4d58853df4

Reduce usage of GrProgramDesc::KeyHeader

Ideally the GrProgramDesc would be a simple program key. We currently can't remove usage of the KeyHeader for "hasPointSize" but this, at least, removes the other uses.

Bug: skia:9455
Change-Id: Ie9e15997ee79c6ffe62b5cd2c96885ca06204383
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/247597
Commit-Queue: Robert Phillips <robertphillips@google.com>
Reviewed-by: Greg Daniel <egdaniel@google.com>

src/gpu/glsl/GrGLSLProgramBuilder.h

diff --git a/src/gpu/glsl/GrGLSLProgramBuilder.h b/src/gpu/glsl/GrGLSLProgramBuilder.h
index d470b69..dc63aa8 100644
--- a/src/gpu/glsl/GrGLSLProgramBuilder.h
+++ b/src/gpu/glsl/GrGLSLProgramBuilder.h
@@ -44,6 +44,11 @@
     GrProcessor::CustomFeatures processorFeatures() const {
         return fProgramInfo.requestedFeatures();
     }
+    bool snapVerticesToPixelCenters() const {
+        return fProgramInfo.pipeline().snapVerticesToPixelCenters();
+    }
+    // TODO: remove this usage of the descriptor's header
+    bool hasPointSize() const { return fDesc->hasPointSize(); }
 
     // TODO: stop passing in the renderTarget for just the sampleLocations
     int effectiveSampleCnt() const {
@@ -55,7 +60,6 @@
     }
 
     const GrProgramDesc* desc() const { return fDesc; }
-    const GrProgramDesc::KeyHeader& header() const { return fDesc->header(); }
 
     void appendUniformDecls(GrShaderFlags visibility, SkString*) const;