diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-02 06:53:26 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-02 12:19:52 +0000 |
| commit | 18c52a7b52211de5d0dcd86dc048adef758c6c75 (patch) | |
| tree | 087aeca9b428687dc7e17578310db1f9621e59ea /include/gpu/mock | |
| parent | 85ae7159c9c8a9186a4c7e74304eabb35bca9a79 (diff) | |
Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend."""
This reverts commit d0d7270fcc32546005b8e847df516cb11592cd30.
Revert "More sample count cleanup:"
This reverts commit d653cac70ed17983125ceed053138c09f1401846.
Revert "Add new GrContext queries for imagability, surfacability, and max sample count of color types"
This reverts commit 85ae7159c9c8a9186a4c7e74304eabb35bca9a79.
Need to understand NVPR perf changes before relanding
Change-Id: I0db075fb42438ef2a1f9885df184dce52892ac4b
Reviewed-on: https://skia-review.googlesource.com/102780
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'include/gpu/mock')
| -rw-r--r-- | include/gpu/mock/GrMockTypes.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/gpu/mock/GrMockTypes.h b/include/gpu/mock/GrMockTypes.h index 0954c5eadc..cf30a333f3 100644 --- a/include/gpu/mock/GrMockTypes.h +++ b/include/gpu/mock/GrMockTypes.h @@ -22,9 +22,8 @@ struct GrMockTextureInfo { */ struct GrMockOptions { GrMockOptions() { - using Renderability = ConfigOptions::Renderability; // By default RGBA_8888 is textureable and renderable and A8 and RGB565 are texturable. - fConfigOptions[kRGBA_8888_GrPixelConfig].fRenderability = Renderability::kNonMSAA; + fConfigOptions[kRGBA_8888_GrPixelConfig].fRenderable[0] = true; fConfigOptions[kRGBA_8888_GrPixelConfig].fTexturable = true; fConfigOptions[kAlpha_8_GrPixelConfig].fTexturable = true; fConfigOptions[kAlpha_8_as_Alpha_GrPixelConfig].fTexturable = true; @@ -33,8 +32,8 @@ struct GrMockOptions { } struct ConfigOptions { - enum Renderability { kNo, kNonMSAA, kMSAA }; - Renderability fRenderability; + /** The first value is for non-MSAA rendering, the second for MSAA. */ + bool fRenderable[2] = {false, false}; bool fTexturable = false; }; |