diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-02-02 13:51:50 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-02-02 23:37:59 +0000 |
| commit | 5bb82cbecd740d21b92e8d2944280ab6eb6af7a6 (patch) | |
| tree | 8171a4ea5d7f72dbba276b58a89a7e115066f24c /include/gpu/mock | |
| parent | 1e5ef4f81ca18cd9448426891cda5120cea51de8 (diff) | |
Revert "Revert "Revert "Revert "Redefine the meaning of sample counts in GPU backend.""""
This reverts commit 18c52a7b52211de5d0dcd86dc048adef758c6c75.
Also relands "More sample count cleanup:" and "Add new GrContext queries for imagability, surfacability, and max sample count of color types"
Bug: skia:
Change-Id: I4028105a3a1f16ce3944e134619eb6245af6b947
Reviewed-on: https://skia-review.googlesource.com/102940
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, 4 insertions, 3 deletions
diff --git a/include/gpu/mock/GrMockTypes.h b/include/gpu/mock/GrMockTypes.h index cf30a333f3..0954c5eadc 100644 --- a/include/gpu/mock/GrMockTypes.h +++ b/include/gpu/mock/GrMockTypes.h @@ -22,8 +22,9 @@ 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].fRenderable[0] = true; + fConfigOptions[kRGBA_8888_GrPixelConfig].fRenderability = Renderability::kNonMSAA; fConfigOptions[kRGBA_8888_GrPixelConfig].fTexturable = true; fConfigOptions[kAlpha_8_GrPixelConfig].fTexturable = true; fConfigOptions[kAlpha_8_as_Alpha_GrPixelConfig].fTexturable = true; @@ -32,8 +33,8 @@ struct GrMockOptions { } struct ConfigOptions { - /** The first value is for non-MSAA rendering, the second for MSAA. */ - bool fRenderable[2] = {false, false}; + enum Renderability { kNo, kNonMSAA, kMSAA }; + Renderability fRenderability; bool fTexturable = false; }; |