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

Unified Diff: ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc

Issue 1423793003: Optimize plane usage when primary is obscured by Overlay (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Check that primary and Overlay formats are same Created 5 years, 2 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 | « no previous file | ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
diff --git a/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
index 8b7bb4c4c78d2c5f2ea2cf221eb67aa2940f1332..d2b9727375865c78e5988b41001ccc942aaadf4a 100644
--- a/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
+++ b/ui/ozone/platform/drm/gpu/hardware_display_controller_unittest.cc
@@ -27,6 +27,8 @@ const uint32_t kSecondaryConnector = 4;
const size_t kPlanesPerCrtc = 2;
const gfx::Size kDefaultModeSize(kDefaultMode.hdisplay, kDefaultMode.vdisplay);
+const gfx::Size kOverlaySize(kDefaultMode.hdisplay / 2,
+ kDefaultMode.vdisplay / 2);
const gfx::SizeF kDefaultModeSizeF(1.0, 1.0);
class MockScanoutBuffer : public ui::ScanoutBuffer {
@@ -158,8 +160,8 @@ TEST_F(HardwareDisplayControllerTest, CheckOverlayPresent) {
ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
new MockScanoutBuffer(kDefaultModeSize)));
ui::OverlayPlane plane2(
- scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kDefaultModeSize)),
- 1, gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kDefaultModeSize),
+ scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kOverlaySize)), 1,
+ gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kOverlaySize),
gfx::RectF(kDefaultModeSizeF));
EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
@@ -181,8 +183,8 @@ TEST_F(HardwareDisplayControllerTest, CheckOverlayTestMode) {
ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
new MockScanoutBuffer(kDefaultModeSize)));
ui::OverlayPlane plane2(
- scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kDefaultModeSize)),
- 1, gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kDefaultModeSize),
+ scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kOverlaySize)), 1,
+ gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kOverlaySize),
gfx::RectF(kDefaultModeSizeF));
EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
@@ -217,6 +219,29 @@ TEST_F(HardwareDisplayControllerTest, CheckOverlayTestMode) {
EXPECT_EQ(2, drm_->get_overlay_flip_call_count());
}
+TEST_F(HardwareDisplayControllerTest, CheckOverlayFullScreenMode) {
+ ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
+ new MockScanoutBuffer(kDefaultModeSize)));
+ ui::OverlayPlane plane2(
+ scoped_refptr<ui::ScanoutBuffer>(new MockScanoutBuffer(kDefaultModeSize)),
+ 1, gfx::OVERLAY_TRANSFORM_NONE, gfx::Rect(kDefaultModeSize),
+ gfx::RectF(kDefaultModeSizeF));
+
+ EXPECT_TRUE(controller_->Modeset(plane1, kDefaultMode));
+
+ std::vector<ui::OverlayPlane> planes;
+ planes.push_back(plane1);
+ planes.push_back(plane2);
+
+ EXPECT_TRUE(controller_->SchedulePageFlip(
+ planes, false /* test_only */,
+ base::Bind(&HardwareDisplayControllerTest::PageFlipCallback,
+ base::Unretained(this))));
+ drm_->RunCallbacks();
+ EXPECT_EQ(1, drm_->get_page_flip_call_count());
+ EXPECT_EQ(0, drm_->get_overlay_flip_call_count());
+}
+
TEST_F(HardwareDisplayControllerTest, RejectUnderlays) {
ui::OverlayPlane plane1(scoped_refptr<ui::ScanoutBuffer>(
new MockScanoutBuffer(kDefaultModeSize)));
« no previous file with comments | « no previous file | ui/ozone/platform/drm/gpu/hardware_display_plane_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698