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

Unified Diff: cc/output/shader.h

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month 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
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/shader.h
diff --git a/cc/output/shader.h b/cc/output/shader.h
index 0384366feb035de586b88c8d17a6d6fdbaf85159..8c1f2647946906b1a87ce00618b3ba3384c020ca 100644
--- a/cc/output/shader.h
+++ b/cc/output/shader.h
@@ -39,7 +39,9 @@ enum SamplerType {
};
enum BlendMode {
+ BlendModeNone,
BlendModeNormal,
+ BlendModeScreen,
BlendModeOverlay,
BlendModeDarken,
BlendModeLighten,
@@ -305,7 +307,7 @@ class FragmentTexBlendMode {
BlendMode blend_mode() const { return blend_mode_; }
void set_blend_mode(BlendMode blend_mode) { blend_mode_ = blend_mode; }
- bool is_default_blend_mode() const { return blend_mode_ == BlendModeNormal; }
+ bool has_blend_mode() const { return blend_mode_ != BlendModeNone; }
protected:
FragmentTexBlendMode();
« no previous file with comments | « cc/output/renderer_pixeltest.cc ('k') | cc/output/shader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698