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

Side by Side Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 2208943002: Revert of Implement filter effects in Core Animation using CAFilters. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@temp50_base
Patch Set: Created 4 years, 4 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 unified diff | Download patch
« no previous file with comments | « no previous file | ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm » ('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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "gpu/command_buffer/service/gles2_cmd_decoder.h" 5 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 #include <stdio.h> 10 #include <stdio.h>
(...skipping 10968 matching lines...) Expand 10 before | Expand all | Expand 10 after
10979 } 10979 }
10980 10980
10981 const GLfloat* mem = GetSharedMemoryAs<const GLfloat*>(c.shm_id, c.shm_offset, 10981 const GLfloat* mem = GetSharedMemoryAs<const GLfloat*>(c.shm_id, c.shm_offset,
10982 8 * sizeof(GLfloat)); 10982 8 * sizeof(GLfloat));
10983 if (!mem) { 10983 if (!mem) {
10984 return error::kOutOfBounds; 10984 return error::kOutOfBounds;
10985 } 10985 }
10986 gfx::RectF contents_rect(mem[0], mem[1], mem[2], mem[3]); 10986 gfx::RectF contents_rect(mem[0], mem[1], mem[2], mem[3]);
10987 gfx::RectF bounds_rect(mem[4], mem[5], mem[6], mem[7]); 10987 gfx::RectF bounds_rect(mem[4], mem[5], mem[6], mem[7]);
10988 10988
10989 // TODO(erikchen): Pass through filter effects. https://crbug.com/581526.
10990 ca_layer_filter_effects_.clear();
10989 ui::CARendererLayerParams params = ui::CARendererLayerParams( 10991 ui::CARendererLayerParams params = ui::CARendererLayerParams(
10990 ca_layer_shared_state_->is_clipped, ca_layer_shared_state_->clip_rect, 10992 ca_layer_shared_state_->is_clipped, ca_layer_shared_state_->clip_rect,
10991 ca_layer_shared_state_->sorting_context_id, 10993 ca_layer_shared_state_->sorting_context_id,
10992 ca_layer_shared_state_->transform, image, contents_rect, 10994 ca_layer_shared_state_->transform, image, contents_rect,
10993 gfx::ToEnclosingRect(bounds_rect), c.background_color, c.edge_aa_mask, 10995 gfx::ToEnclosingRect(bounds_rect), c.background_color, c.edge_aa_mask,
10994 ca_layer_shared_state_->opacity, filter); 10996 ca_layer_shared_state_->opacity, filter);
10995 params.filter_effects.swap(ca_layer_filter_effects_);
10996
10997 if (!surface_->ScheduleCALayer(params)) { 10997 if (!surface_->ScheduleCALayer(params)) {
10998 LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM", 10998 LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION, "glScheduleCALayerCHROMIUM",
10999 "failed to schedule CALayer"); 10999 "failed to schedule CALayer");
11000 } 11000 }
11001 return error::kNoError; 11001 return error::kNoError;
11002 } 11002 }
11003 11003
11004 void GLES2DecoderImpl::DoScheduleCALayerFilterEffectsCHROMIUM( 11004 void GLES2DecoderImpl::DoScheduleCALayerFilterEffectsCHROMIUM(
11005 GLsizei count, 11005 GLsizei count,
11006 const GLCALayerFilterEffect* filter_effects) { 11006 const GLCALayerFilterEffect* filter_effects) {
(...skipping 6669 matching lines...) Expand 10 before | Expand all | Expand 10 after
17676 } 17676 }
17677 17677
17678 // Include the auto-generated part of this file. We split this because it means 17678 // Include the auto-generated part of this file. We split this because it means
17679 // we can easily edit the non-auto generated parts right here in this file 17679 // we can easily edit the non-auto generated parts right here in this file
17680 // instead of having to edit some template or the code generator. 17680 // instead of having to edit some template or the code generator.
17681 #include "base/macros.h" 17681 #include "base/macros.h"
17682 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h" 17682 #include "gpu/command_buffer/service/gles2_cmd_decoder_autogen.h"
17683 17683
17684 } // namespace gles2 17684 } // namespace gles2
17685 } // namespace gpu 17685 } // namespace gpu
OLDNEW
« no previous file with comments | « no previous file | ui/accelerated_widget_mac/ca_layer_tree_unittest_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698