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

Unified Diff: cc/output/program_binding.h

Issue 988693005: Chromium roll (https://codereview.chromium.org/976353002) (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: fixed bad android build patch Created 5 years, 9 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
« no previous file with comments | « cc/output/overlay_unittest.cc ('k') | cc/output/renderer_pixeltest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/output/program_binding.h
diff --git a/cc/output/program_binding.h b/cc/output/program_binding.h
index 9c3244ca52841384119bc6353a46d2e8038d5854..1d5132bdaea6828148ab4d996774a1569fd00ad2 100644
--- a/cc/output/program_binding.h
+++ b/cc/output/program_binding.h
@@ -58,8 +58,24 @@ class ProgramBinding : public ProgramBindingBase {
void Initialize(ContextProvider* context_provider,
TexCoordPrecision precision,
+ SamplerType sampler) {
+ return Initialize(
+ context_provider, precision, sampler, BLEND_MODE_NONE, false);
+ }
+
+ void Initialize(ContextProvider* context_provider,
+ TexCoordPrecision precision,
+ SamplerType sampler,
+ BlendMode blend_mode) {
+ return Initialize(
+ context_provider, precision, sampler, blend_mode, false);
+ }
+
+ void Initialize(ContextProvider* context_provider,
+ TexCoordPrecision precision,
SamplerType sampler,
- BlendMode blend_mode = BLEND_MODE_NONE) {
+ BlendMode blend_mode,
+ bool mask_for_background) {
DCHECK(context_provider);
DCHECK(!initialized_);
@@ -67,6 +83,7 @@ class ProgramBinding : public ProgramBindingBase {
return;
fragment_shader_.set_blend_mode(blend_mode);
+ fragment_shader_.set_mask_for_background(mask_for_background);
if (!ProgramBindingBase::Init(
context_provider->ContextGL(),
« no previous file with comments | « cc/output/overlay_unittest.cc ('k') | cc/output/renderer_pixeltest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698