Reland "Remove antialiasing control from GrPaint."

This contains fixes for GLPrograms test and mixed samples rendering.

This reverts commit 419d81eed4a010e6080db199795117cbedf9e6e4.

BUG=skia:

Change-Id: If8f002fbfaaaab6d1607403f2b15ccc7f1e17e87
Reviewed-on: https://skia-review.googlesource.com/5763
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Robert Phillips <robertphillips@google.com>

1 files changed, 15 insertions, 0 deletions

diff --git a/include/gpu/GrTypesPriv.h b/include/gpu/GrTypesPriv.h
index 51dccc5f7d..53e71e74ab 100644
--- a/include/gpu/GrTypesPriv.h
+++ b/include/gpu/GrTypesPriv.h
@@ -11,6 +11,21 @@
 #include "GrTypes.h"
 #include "SkRefCnt.h"
 
+/** This enum indicates the type of antialiasing to be performed. */
+enum class GrAAType {
+    /** No antialiasing */
+    kNone,
+    /** Use fragment shader code to compute a fractional pixel coverage. */
+    kCoverage,
+    /** Use normal MSAA. */
+    kMSAA,
+    /**
+     * Use "mixed samples" MSAA such that the stencil buffer is multisampled but the color buffer is
+     * not.
+     */
+    kMixedSamples
+};
+
  /**
   * Types of shader-language-specific boxed variables we can create. (Currently only GrGLShaderVars,
   * but should be applicable to other shader languages.)