aboutsummaryrefslogtreecommitdiffhomepage
path: root/include
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-07-08 10:20:21 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-07-08 10:20:21 -0700
commitd07a2793baea42956d27b3ad47ed562f08e4570a (patch)
tree43f0a8ac998e1fc05b7063e65c3f69317f209e68 /include
parent60c047557559e5410063452e59d65377e813e5f2 (diff)
Revert of Rework GrPipelineInfo (patchset #7 id:120001 of https://codereview.chromium.org/1213383005/)
Reason for revert: breaking stuff! Original issue's description: > Makes GrPipelineInfo a class with query functions used by GrBatch subclasses. > > Committed: https://skia.googlesource.com/skia/+/f5179a4c490bc787190321bd8ffdb0e6a4efa9ac TBR=joshualitt@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1213013003
Diffstat (limited to 'include')
-rw-r--r--include/gpu/GrXferProcessor.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h
index 41f8abb740..332d9d2e23 100644
--- a/include/gpu/GrXferProcessor.h
+++ b/include/gpu/GrXferProcessor.h
@@ -104,6 +104,10 @@ public:
*/
enum OptFlags {
/**
+ * No optimizations needed
+ */
+ kNone_Opt = 0,
+ /**
* The draw can be skipped completely.
*/
kSkipDraw_OptFlag = 0x1,
@@ -125,8 +129,6 @@ public:
kCanTweakAlphaForCoverage_OptFlag = 0x20,
};
- static const OptFlags kNone_OptFlags = (OptFlags)0;
-
GR_DECL_BITFIELD_OPS_FRIENDS(OptFlags);
/**