Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(550)

Unified Diff: include/gpu/GrXferProcessor.h

Issue 1180713008: Move blend enums into GrBlend.h (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: relative include Created 5 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: include/gpu/GrXferProcessor.h
diff --git a/include/gpu/GrXferProcessor.h b/include/gpu/GrXferProcessor.h
index 8f2c69d9956e89de59ccc97041162e5c217b1751..332d9d2e23cc865e3d3170a70a882fb2eb7f58e9 100644
--- a/include/gpu/GrXferProcessor.h
+++ b/include/gpu/GrXferProcessor.h
@@ -8,6 +8,7 @@
#ifndef GrXferProcessor_DEFINED
#define GrXferProcessor_DEFINED
+#include "GrBlend.h"
#include "GrColor.h"
#include "GrProcessor.h"
#include "GrTexture.h"
@@ -20,66 +21,6 @@ class GrGLXferProcessor;
class GrProcOptInfo;
/**
- * Equations for alpha-blending.
- */
-enum GrBlendEquation {
- // Basic blend equations.
- kAdd_GrBlendEquation, //<! Cs*S + Cd*D
- kSubtract_GrBlendEquation, //<! Cs*S - Cd*D
- kReverseSubtract_GrBlendEquation, //<! Cd*D - Cs*S
-
- // Advanced blend equations. These are described in the SVG and PDF specs.
- kScreen_GrBlendEquation,
- kOverlay_GrBlendEquation,
- kDarken_GrBlendEquation,
- kLighten_GrBlendEquation,
- kColorDodge_GrBlendEquation,
- kColorBurn_GrBlendEquation,
- kHardLight_GrBlendEquation,
- kSoftLight_GrBlendEquation,
- kDifference_GrBlendEquation,
- kExclusion_GrBlendEquation,
- kMultiply_GrBlendEquation,
- kHSLHue_GrBlendEquation,
- kHSLSaturation_GrBlendEquation,
- kHSLColor_GrBlendEquation,
- kHSLLuminosity_GrBlendEquation,
-
- kFirstAdvancedGrBlendEquation = kScreen_GrBlendEquation,
- kLast_GrBlendEquation = kHSLLuminosity_GrBlendEquation
-};
-
-static const int kGrBlendEquationCnt = kLast_GrBlendEquation + 1;
-
-/**
- * Coeffecients for alpha-blending.
- */
-enum GrBlendCoeff {
- kZero_GrBlendCoeff, //<! 0
- kOne_GrBlendCoeff, //<! 1
- kSC_GrBlendCoeff, //<! src color
- kISC_GrBlendCoeff, //<! one minus src color
- kDC_GrBlendCoeff, //<! dst color
- kIDC_GrBlendCoeff, //<! one minus dst color
- kSA_GrBlendCoeff, //<! src alpha
- kISA_GrBlendCoeff, //<! one minus src alpha
- kDA_GrBlendCoeff, //<! dst alpha
- kIDA_GrBlendCoeff, //<! one minus dst alpha
- kConstC_GrBlendCoeff, //<! constant color
- kIConstC_GrBlendCoeff, //<! one minus constant color
- kConstA_GrBlendCoeff, //<! constant color alpha
- kIConstA_GrBlendCoeff, //<! one minus constant color alpha
- kS2C_GrBlendCoeff,
- kIS2C_GrBlendCoeff,
- kS2A_GrBlendCoeff,
- kIS2A_GrBlendCoeff,
-
- kLast_GrBlendCoeff = kIS2A_GrBlendCoeff
-};
-
-static const int kGrBlendCoeffCnt = kLast_GrBlendCoeff + 1;
-
-/**
* Barriers for blending. When a shader reads the dst directly, an Xfer barrier is sometimes
* required after a pixel has been written, before it can be safely read again.
*/
« include/gpu/GrBlend.h ('K') | « include/gpu/GrBlend.h ('k') | src/gpu/GrBlend.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698