Index: src/gpu/gl/GrGLCaps.h |
diff --git a/src/gpu/gl/GrGLCaps.h b/src/gpu/gl/GrGLCaps.h |
index 857ebbc101c37bc201761c340f2f486a301e7741..1eaae2287b8d9fbea284c62118192816730fde64 100644 |
--- a/src/gpu/gl/GrGLCaps.h |
+++ b/src/gpu/gl/GrGLCaps.h |
@@ -28,23 +28,6 @@ public: |
typedef GrGLStencilBuffer::Format StencilFormat; |
/** |
- * Represents a supported multisampling/coverage-sampling mode. |
- */ |
- struct MSAACoverageMode { |
- // "Coverage samples" includes samples that actually have color, depth, |
- // stencil, ... as well as those that don't (coverage only). All samples |
- // are coverage samples. (We're using the word "coverage sample" to |
- // match the NV extension language.) |
- int fCoverageSampleCnt; |
- |
- // Color samples are samples that store data values (color, stencil, |
- // depth) rather than just representing coverage. They are a subset |
- // of coverage samples. (Again the wording was chosen to match the |
- // extension.) |
- int fColorSampleCnt; |
- }; |
- |
- /** |
* The type of MSAA for FBOs supported. Different extensions have different |
* semantics of how / when a resolve is performed. |
*/ |
@@ -95,18 +78,6 @@ public: |
kLast_FBFetchType = kNV_FBFetchType, |
}; |
- enum CoverageAAType { |
- /** |
- * No coverage sample support |
- */ |
- kNone_CoverageAAType, |
- |
- /** |
- * GL_NV_framebuffer_multisample_coverage |
- */ |
- kNVDesktop_CoverageAAType, |
- }; |
- |
/** |
* Creates a GrGLCaps that advertises no support for any extensions, |
* formats, etc. Call init to initialize from a GrGLContextInfo. |
@@ -186,20 +157,6 @@ public: |
kES_EXT_MsToTexture_MSFBOType == fMSFBOType; |
} |
- /** |
- * Reports the type of coverage sample AA support. |
- */ |
- CoverageAAType coverageAAType() const { return fCoverageAAType; } |
- |
- /** |
- * Chooses a supported coverage mode based on a desired sample count. The |
- * desired sample count is rounded up the next supported coverage sample |
- * count unless a it is larger than the max in which case it is rounded |
- * down. Once a coverage sample count is decided, the supported mode with |
- * the fewest color samples is chosen. |
- */ |
- const MSAACoverageMode& getMSAACoverageMode(int desiredSampleCount) const; |
- |
FBFetchType fbFetchType() const { return fFBFetchType; } |
/** |
@@ -348,8 +305,6 @@ private: |
int fMaxFixedFunctionTextureCoords; |
MSFBOType fMSFBOType; |
- CoverageAAType fCoverageAAType; |
- SkTDArray<MSAACoverageMode> fMSAACoverageModes; |
FBFetchType fFBFetchType; |