diff options
author | eroman <eroman@chromium.org> | 2015-02-27 14:12:26 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-02-27 22:13:06 +0000 |
commit | 822f0dc371abb09ecfb726ec4962c18998728eb7 (patch) | |
tree | 2eeddfdb93f453378be88ca4d359e96433ac371e /cc/output/dynamic_geometry_binding.h | |
parent | 130761b4c49b06f4b4f075df841e473cce2af208 (diff) | |
download | chromium_src-822f0dc371abb09ecfb726ec4962c18998728eb7.zip chromium_src-822f0dc371abb09ecfb726ec4962c18998728eb7.tar.gz chromium_src-822f0dc371abb09ecfb726ec4962c18998728eb7.tar.bz2 |
Revert of Splitting of layers for correct intersections (patchset #17 id:310001 of https://codereview.chromium.org/595593002/)
Reason for revert:
Static initializers count increased
Original issue's description:
> Splitting of layers for correct intersections
>
> Sorting 3d-sorted layers and rendering them in that order causes issues
> when layers intersect. Instead place 3d-sorted layers in a bsp tree and
> fragment any intersecting layers into non-rectangular quads. We can then
> render the fragments in the correct sorted order regardless of
> intersections.
>
> BUG=455918,159225,132122,230833
>
> Committed: https://crrev.com/ac754705ceaa5bc4cb8dc8df9a733b4b68396399
> Cr-Commit-Position: refs/heads/master@{#318506}
TBR=enne@chromium.org,danakj@chromium.org,thakis@chromium.org,awoloszyn@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=455918,159225,132122,230833
Review URL: https://codereview.chromium.org/960893004
Cr-Commit-Position: refs/heads/master@{#318528}
Diffstat (limited to 'cc/output/dynamic_geometry_binding.h')
-rw-r--r-- | cc/output/dynamic_geometry_binding.h | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/cc/output/dynamic_geometry_binding.h b/cc/output/dynamic_geometry_binding.h deleted file mode 100644 index 4e4ea3d..0000000 --- a/cc/output/dynamic_geometry_binding.h +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright 2015 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#ifndef CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_ -#define CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_ - -#include "cc/output/geometry_binding.h" - -namespace cc { - -class DynamicGeometryBinding { - public: - explicit DynamicGeometryBinding(gpu::gles2::GLES2Interface* gl); - void PrepareForDraw(); - void InitializeCustomQuad(const gfx::QuadF& quad); - void InitializeCustomQuadWithUVs(const gfx::QuadF& quad, const float uv[8]); - - private: - gpu::gles2::GLES2Interface* gl_; - - GLuint quad_vertices_vbo_; - GLuint quad_elements_vbo_; - - DISALLOW_COPY_AND_ASSIGN(DynamicGeometryBinding); -}; - -} // namespace cc - -#endif // CC_OUTPUT_DYNAMIC_GEOMETRY_BINDING_H_ |