aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/gpu/mock
diff options
context:
space:
mode:
authorGravatar Brian Salomon <bsalomon@google.com>2018-02-02 06:53:26 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-02-02 12:19:52 +0000
commit18c52a7b52211de5d0dcd86dc048adef758c6c75 (patch)
tree087aeca9b428687dc7e17578310db1f9621e59ea /src/gpu/mock
parent85ae7159c9c8a9186a4c7e74304eabb35bca9a79 (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 'src/gpu/mock')
-rw-r--r--src/gpu/mock/GrMockCaps.h34
-rw-r--r--src/gpu/mock/GrMockTexture.h7
2 files changed, 8 insertions, 33 deletions
diff --git a/src/gpu/mock/GrMockCaps.h b/src/gpu/mock/GrMockCaps.h
index 1e448516d7..edec5563c4 100644
--- a/src/gpu/mock/GrMockCaps.h
+++ b/src/gpu/mock/GrMockCaps.h
@@ -33,39 +33,19 @@ public:
this->applyOptionsOverrides(contextOptions);
}
+ int getSampleCount(int /*requestCount*/, GrPixelConfig /*config*/) const override {
+ return 0;
+ }
bool isConfigTexturable(GrPixelConfig config) const override {
return fOptions.fConfigOptions[config].fTexturable;
}
-
+ bool isConfigRenderable(GrPixelConfig config, bool withMSAA) const override {
+ return fOptions.fConfigOptions[config].fRenderable[withMSAA];
+ }
bool isConfigCopyable(GrPixelConfig config) const override {
return false;
}
- int getRenderTargetSampleCount(int requestCount, GrPixelConfig config) const override {
- requestCount = SkTMax(requestCount, 1);
- switch (fOptions.fConfigOptions[config].fRenderability) {
- case GrMockOptions::ConfigOptions::Renderability::kNo:
- return 0;
- case GrMockOptions::ConfigOptions::Renderability::kNonMSAA:
- return requestCount > 1 ? 0 : 1;
- case GrMockOptions::ConfigOptions::Renderability::kMSAA:
- return requestCount > kMaxSampleCnt ? 0 : GrNextPow2(requestCount);
- }
- return 0;
- }
-
- int maxRenderTargetSampleCount(GrPixelConfig config) const override {
- switch (fOptions.fConfigOptions[config].fRenderability) {
- case GrMockOptions::ConfigOptions::Renderability::kNo:
- return 0;
- case GrMockOptions::ConfigOptions::Renderability::kNonMSAA:
- return 1;
- case GrMockOptions::ConfigOptions::Renderability::kMSAA:
- return kMaxSampleCnt;
- }
- return 0;
- }
-
bool initDescForDstCopy(const GrRenderTargetProxy* src, GrSurfaceDesc* desc,
bool* rectsMustMatch, bool* disallowSubrect) const override {
return false;
@@ -82,8 +62,6 @@ public:
}
private:
- static const int kMaxSampleCnt = 16;
-
GrMockOptions fOptions;
typedef GrCaps INHERITED;
};
diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index b5cc4a27c0..9b6501a3c4 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -90,11 +90,8 @@ private:
}
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
- if (numColorSamples > 1) {
- // Add one to account for the resolve buffer.
- ++numColorSamples;
- }
+ // The plus 1 is to account for the resolve texture.
+ int numColorSamples = this->numColorSamples() + 1;
return GrSurface::ComputeSize(this->config(), this->width(), this->height(),
numColorSamples,
this->texturePriv().mipMapped());