diff options
author | Chris Dalton <csmartdalton@google.com> | 2018-02-20 09:51:59 -0700 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-20 17:19:13 +0000 |
commit | 535ba8d2b862a364f7f8009d6e79cd41519f5643 (patch) | |
tree | 9a02a366b03b6172d94e01fea18138d755b01b87 /src/gpu/GrProgramDesc.cpp | |
parent | cfac205c5e1d31588ba5da2c7cb551f0d067de09 (diff) |
Drop unused support for MSAA sample locations
Bug: skia:
Change-Id: I96f0c25732d79c5881e400b121e81c5696a747a6
Reviewed-on: https://skia-review.googlesource.com/107441
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/GrProgramDesc.cpp')
-rw-r--r-- | src/gpu/GrProgramDesc.cpp | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/src/gpu/GrProgramDesc.cpp b/src/gpu/GrProgramDesc.cpp index 976b12ab09..0a558e06b9 100644 --- a/src/gpu/GrProgramDesc.cpp +++ b/src/gpu/GrProgramDesc.cpp @@ -166,7 +166,6 @@ bool GrProgramDesc::Build(GrProgramDesc* desc, desc->key().reset(); return false; } - GrProcessor::RequiredFeatures requiredFeatures = primProc.requiredFeatures(); for (int i = 0; i < pipeline.numFragmentProcessors(); ++i) { const GrFragmentProcessor& fp = pipeline.getFragmentProcessor(i); @@ -174,7 +173,6 @@ bool GrProgramDesc::Build(GrProgramDesc* desc, desc->key().reset(); return false; } - requiredFeatures |= fp.requiredFeatures(); } const GrXferProcessor& xp = pipeline.getXferProcessor(); @@ -189,7 +187,6 @@ bool GrProgramDesc::Build(GrProgramDesc* desc, desc->key().reset(); return false; } - requiredFeatures |= xp.requiredFeatures(); // --------DO NOT MOVE HEADER ABOVE THIS LINE-------------------------------------------------- // Because header is a pointer into the dynamic array, we can't push any new data into the key @@ -198,21 +195,7 @@ bool GrProgramDesc::Build(GrProgramDesc* desc, // make sure any padding in the header is zeroed. memset(header, 0, kHeaderSize); - - GrRenderTargetProxy* proxy = pipeline.proxy(); - - if (requiredFeatures & GrProcessor::kSampleLocations_RequiredFeature) { - SkASSERT(pipeline.isHWAntialiasState()); - - GrRenderTarget* rt = pipeline.renderTarget(); - header->fSamplePatternKey = - rt->renderTargetPriv().getMultisampleSpecs(pipeline).fUniqueID; - } else { - header->fSamplePatternKey = 0; - } - - header->fOutputSwizzle = shaderCaps.configOutputSwizzle(proxy->config()).asKey(); - + header->fOutputSwizzle = shaderCaps.configOutputSwizzle(pipeline.proxy()->config()).asKey(); header->fSnapVerticesToPixelCenters = pipeline.snapVerticesToPixelCenters(); header->fColorFragmentProcessorCnt = pipeline.numColorFragmentProcessors(); header->fCoverageFragmentProcessorCnt = pipeline.numCoverageFragmentProcessors(); |