Eliminate mixed samples as an FBO type or AA type
From now on, sample counts always refer to the number of actual color
samples, and render targets don't have separate color and stencil
sample counts.
If mixed samples support is available when making a
"GrAAType::kCoverage" draw, then an op may attach and use a mixed
sampled stencil buffer internally. But this will all be invisible to
the client.
After this CL, we temporarily won't have a mode to use nvpr with mixed
samples. That will soon be fixed by a follow-on CL that enables nvpr
with mixed samples in the normal "gl" and "gles" configs.
Bug: skia:
Change-Id: I1cb8277f0d2d0d371f24bb9f39cd473ed5c5c83b
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/221878
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>
diff --git a/src/gpu/mock/GrMockTexture.h b/src/gpu/mock/GrMockTexture.h
index b6a2a6e..d7aa866 100644
--- a/src/gpu/mock/GrMockTexture.h
+++ b/src/gpu/mock/GrMockTexture.h
@@ -90,7 +90,7 @@
bool completeStencilAttachment() override { return true; }
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolve buffer.
++numColorSamples;
@@ -104,7 +104,7 @@
if (GrStencilAttachment* stencil = this->renderTargetPriv().getStencilAttachment()) {
numStencilBits = stencil->bits();
}
- return {this->width(), this->height(), this->numColorSamples(), numStencilBits, fInfo};
+ return {this->width(), this->height(), this->numSamples(), numStencilBits, fInfo};
}
GrBackendFormat backendFormat() const override {
@@ -170,7 +170,7 @@
}
size_t onGpuMemorySize() const override {
- int numColorSamples = this->numColorSamples();
+ int numColorSamples = this->numSamples();
if (numColorSamples > 1) {
// Add one to account for the resolve buffer.
++numColorSamples;
@@ -182,7 +182,7 @@
void computeScratchKey(GrScratchKey* key) const override {
GrTexturePriv::ComputeScratchKey(this->config(), this->width(), this->height(),
- true, this->numStencilSamples(),
+ true, this->numSamples(),
this->texturePriv().mipMapped(), key);
}
};