diff options
author | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 20:09:03 +0000 |
---|---|---|
committer | jamesr@chromium.org <jamesr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-11 20:09:03 +0000 |
commit | 6fae8a38608b2c3045ab9d177de1a61f3aa73917 (patch) | |
tree | b43bb918797048d8f4028015d966eb5c799932a4 /cc/cc_tests.gyp | |
parent | edef1c25eb44529879f759b46719bfed1fdfe4ff (diff) | |
download | chromium_src-6fae8a38608b2c3045ab9d177de1a61f3aa73917.zip chromium_src-6fae8a38608b2c3045ab9d177de1a61f3aa73917.tar.gz chromium_src-6fae8a38608b2c3045ab9d177de1a61f3aa73917.tar.bz2 |
Pixel tests and some shared quad state fixups
This adds some pixel tests for the output of SurfaceAggregator and fixes several
issues related to shared quad state management. This also concatenates the
transform for the surface draw quad with the quads aggregated into the root draw
pass of the referenced surface.
Shared quad state mapping is a little bit nontrivial when doing aggregation
since we copy the shared quad state entries from the aggregated frame's root
pass into the shared quad state list of the pass containing the surface quad.
When doing multiple levels of aggregation the relationship between the shared
quad list offset from the aggregated pass to the destination pass gets tricky.
Here's how this patch handles things:
Root surface root pass:
shared_quad_state_list: [A], [B]
quad_list: [Quad using (A)], [Quad using (A)], [Surface 1], [Quad using (B)]
Surface 1 root pass:
shared_quad_state_list: [C], [D]
quad_list: [Quad using (C)], [Surface 2], [Surface 3], [Quad using (D)]
Surface 2 root pass:
shared_quad_state_list: [E]
quad_list: [Quad using (E)]
Surface 3 root pass:
shared_quad_state_list: [F]
quad_list: [Quad using (F)]
We append the shared quad stats to the aggregated pass' list as we encounter
the quads that reference them, so the final aggregated frame looks like this:
Aggregated frame root pass:
shared_quad_state_list: [A], [C], [E], [F], [D], [B]
quad_list: [Quad using (A)], [Quad using (A)], [Quad using (C)],
[Quad using (E)], [Quad using (F)], [Quad using (D)],
[Quad using (B)]
Note that there's no shared quad state for the surface quads in the final shared
quad state list. We use the transform and other properties from the surface quad's
shared quad state when aggregating, but don't need them beyond aggregation.
BUG=334876
Review URL: https://codereview.chromium.org/142863015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@250484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'cc/cc_tests.gyp')
-rw-r--r-- | cc/cc_tests.gyp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp index 05d8b79..437f99d 100644 --- a/cc/cc_tests.gyp +++ b/cc/cc_tests.gyp @@ -105,10 +105,11 @@ 'trees/tree_synchronizer_unittest.cc', ], 'cc_surfaces_unit_tests_source_files': [ - 'surfaces/surface_unittest.cc', - 'surfaces/surface_aggregator_unittest.cc', 'surfaces/surface_aggregator_test_helpers.cc', 'surfaces/surface_aggregator_test_helpers.h', + 'surfaces/surface_aggregator_unittest.cc', + 'surfaces/surface_unittest.cc', + 'surfaces/surfaces_pixeltest.cc', ], 'cc_tests_support_files': [ 'test/animation_test_common.cc', |