commit 8c4cafd297fc4cc7bb566896bfa295b567c3c22a
author Chris Dalton <csmartdalton@google.com> Mon Apr 15 19:14:36 2019 -0600
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Apr 16 15:21:33 2019 +0000
tree 914201a91cca2a76722048fbf3ab8452f123f9e0
parent c48bf3a34b765f5beabe8d79656df8f2d6cca800

Don't flush pipeline state when querying sample locations in GL

This was a relic from back when we could use EXT_raster_multisample.
Since MSAA is now always baked into the framebuffer attachments, this
is no longer necessary.

Bug: skia:
Change-Id: I47c66fcdbd008e057dab5eae457bb70ec8e6bb9f
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/208460
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>

src/gpu/GrProgramDesc.cpp

diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp
index a066145..6709dc4 100644
--- a/src/gpu/GrProgramDesc.cpp
+++ b/src/gpu/GrProgramDesc.cpp
@@ -231,7 +231,7 @@
 
     if (processorFeatures & GrProcessor::CustomFeatures::kSampleLocations) {
         SkASSERT(pipeline.isHWAntialiasState());
-        b.add32(renderTarget->renderTargetPriv().getSamplePatternKey(pipeline));
+        b.add32(renderTarget->renderTargetPriv().getSamplePatternKey());
     }
 
     // --------DO NOT MOVE HEADER ABOVE THIS LINE--------------------------------------------------