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

Side by Side Diff: cc/output/gl_renderer.cc

Issue 2467643002: mac: Fix bug where opacity is applied twice on RenderPassDrawQuads. (Closed)
Patch Set: Comments from kbr. Created 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | content/test/data/gpu/filter_effects.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2010 The Chromium Authors. All rights reserved. 1 // Copyright 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/output/gl_renderer.h" 5 #include "cc/output/gl_renderer.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 4024 matching lines...) Expand 10 before | Expand all | Expand 10 after
4035 GLfloat clip_rect[4] = {ca_layer_overlay->shared_state->clip_rect.x(), 4035 GLfloat clip_rect[4] = {ca_layer_overlay->shared_state->clip_rect.x(),
4036 ca_layer_overlay->shared_state->clip_rect.y(), 4036 ca_layer_overlay->shared_state->clip_rect.y(),
4037 ca_layer_overlay->shared_state->clip_rect.width(), 4037 ca_layer_overlay->shared_state->clip_rect.width(),
4038 ca_layer_overlay->shared_state->clip_rect.height()}; 4038 ca_layer_overlay->shared_state->clip_rect.height()};
4039 GLint sorting_context_id = ca_layer_overlay->shared_state->sorting_context_id; 4039 GLint sorting_context_id = ca_layer_overlay->shared_state->sorting_context_id;
4040 SkMatrix44 transform = ca_layer_overlay->shared_state->transform; 4040 SkMatrix44 transform = ca_layer_overlay->shared_state->transform;
4041 GLfloat gl_transform[16]; 4041 GLfloat gl_transform[16];
4042 transform.asColMajorf(gl_transform); 4042 transform.asColMajorf(gl_transform);
4043 unsigned filter = ca_layer_overlay->filter; 4043 unsigned filter = ca_layer_overlay->filter;
4044 4044
4045 gl_->ScheduleCALayerSharedStateCHROMIUM( 4045 // The alpha has already been applied when copying the RPDQ to an IOSurface.
4046 ca_layer_overlay->shared_state->opacity, is_clipped, clip_rect, 4046 GLfloat alpha = 1;
4047 sorting_context_id, gl_transform); 4047 gl_->ScheduleCALayerSharedStateCHROMIUM(alpha, is_clipped, clip_rect,
4048 sorting_context_id, gl_transform);
4048 gl_->ScheduleCALayerCHROMIUM( 4049 gl_->ScheduleCALayerCHROMIUM(
4049 texture_id, contents_rect, ca_layer_overlay->background_color, 4050 texture_id, contents_rect, ca_layer_overlay->background_color,
4050 ca_layer_overlay->edge_aa_mask, bounds_rect, filter); 4051 ca_layer_overlay->edge_aa_mask, bounds_rect, filter);
4051 } 4052 }
4052 4053
4053 } // namespace cc 4054 } // namespace cc
OLDNEW
« no previous file with comments | « no previous file | content/test/data/gpu/filter_effects.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698