From 07a255310aca9f3e83bf741dc663a58818ad681c Mon Sep 17 00:00:00 2001
From: joshualitt <joshualitt@chromium.org>
Date: Tue, 7 Oct 2014 08:05:21 -0700
Subject: gl programs rewrite

BUG=skia:

Review URL: https://codereview.chromium.org/628633003
---
 include/gpu/GrProcessor.h | 2 ++
 include/gpu/GrTypes.h     | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'include/gpu')

diff --git a/include/gpu/GrProcessor.h b/include/gpu/GrProcessor.h
index 2dbead1c22..c1755a8954 100644
--- a/include/gpu/GrProcessor.h
+++ b/include/gpu/GrProcessor.h
@@ -42,6 +42,8 @@ public:
         uint32_t fValidFlags;
         bool fIsSingleComponent;
 
+        InvariantOutput() : fColor(0), fValidFlags(0), fIsSingleComponent(false) {}
+
         bool isOpaque() const {
             return ((fValidFlags & kA_GrColorComponentFlag) && 0xFF == GrColorUnpackA(fColor));
         }
diff --git a/include/gpu/GrTypes.h b/include/gpu/GrTypes.h
index 22b2e224f6..1f5f9179b9 100644
--- a/include/gpu/GrTypes.h
+++ b/include/gpu/GrTypes.h
@@ -222,8 +222,10 @@ enum GrBlendCoeff {
     kConstA_GrBlendCoeff,  //<! constant color alpha
     kIConstA_GrBlendCoeff, //<! one minus constant color alpha
 
-    kPublicGrBlendCoeffCount
+    kFirstPublicGrBlendCoeff = kZero_GrBlendCoeff,
+    kLastPublicGrBlendCoeff = kIConstA_GrBlendCoeff,
 };
+static const int kPublicGrBlendCoeffCount = kLastPublicGrBlendCoeff + 1;
 
 /**
  *  Formats for masks, used by the font cache.
-- 
cgit v1.2.3