diff options
author | cdalton <cdalton@nvidia.com> | 2015-11-11 15:16:07 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-11 15:16:07 -0800 |
commit | 7e806f3f8a542bb6b2026a843de99a8640e2e87f (patch) | |
tree | e742a662eab77816f71836a77b473934bde22fa1 /src/gpu/GrCaps.cpp | |
parent | 24ddb0a4ddbf4b576b2c8a6fc19765e00c3bd34d (diff) |
Revert of Enable stencil clipping in mixed sampled render targets (patchset #6 id:100001 of https://codereview.chromium.org/1232103002/ )
Reason for revert:
Co-centered sample locations are not needed to do stencil clip with mixed samples
Original issue's description:
> Implement stencil clipping in mixed sampled render targets
>
> This change enables multisampled clipping for mixed sampled
> render targets. Previously clipping in mixed samples config
> behaved the same as in the gpu config.
>
> In order to retrofit non-MSAA draw methods, programmable sample
> locations are used in order to colocate all samples at (0.5, 0.5).
> Requires support for NV_sample_locations.
>
> BUG=skia:4399
>
> Committed:
> https://skia.googlesource.com/skia/+/3e77ba96d56d15db30ac6d8ccb900e30aafcbb16
BUG=skia:
Review URL: https://codereview.chromium.org/1415873011
Diffstat (limited to 'src/gpu/GrCaps.cpp')
-rw-r--r-- | src/gpu/GrCaps.cpp | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/src/gpu/GrCaps.cpp b/src/gpu/GrCaps.cpp index e4f81ab79b..7003cc5bfe 100644 --- a/src/gpu/GrCaps.cpp +++ b/src/gpu/GrCaps.cpp @@ -15,7 +15,6 @@ GrShaderCaps::GrShaderCaps() { fPathRenderingSupport = false; fDstReadInShaderSupport = false; fDualSourceBlendingSupport = false; - fProgrammableSampleLocationsSupport = false; fShaderPrecisionVaries = false; } @@ -46,14 +45,13 @@ static const char* precision_to_string(GrSLPrecision p) { SkString GrShaderCaps::dump() const { SkString r; static const char* gNY[] = { "NO", "YES" }; - r.appendf("Shader Derivative Support : %s\n", gNY[fShaderDerivativeSupport]); - r.appendf("Geometry Shader Support : %s\n", gNY[fGeometryShaderSupport]); - r.appendf("Path Rendering Support : %s\n", gNY[fPathRenderingSupport]); - r.appendf("Dst Read In Shader Support : %s\n", gNY[fDstReadInShaderSupport]); - r.appendf("Dual Source Blending Support : %s\n", gNY[fDualSourceBlendingSupport]); - r.appendf("Programmable Sample Locations Support : %s\n", gNY[fProgrammableSampleLocationsSupport]); - - r.appendf("Shader Float Precisions (varies: %s) :\n", gNY[fShaderPrecisionVaries]); + r.appendf("Shader Derivative Support : %s\n", gNY[fShaderDerivativeSupport]); + r.appendf("Geometry Shader Support : %s\n", gNY[fGeometryShaderSupport]); + r.appendf("Path Rendering Support : %s\n", gNY[fPathRenderingSupport]); + r.appendf("Dst Read In Shader Support : %s\n", gNY[fDstReadInShaderSupport]); + r.appendf("Dual Source Blending Support : %s\n", gNY[fDualSourceBlendingSupport]); + + r.appendf("Shader Float Precisions (varies: %s):\n", gNY[fShaderPrecisionVaries]); for (int s = 0; s < kGrShaderTypeCount; ++s) { GrShaderType shaderType = static_cast<GrShaderType>(s); |