summaryrefslogtreecommitdiff
path: root/services/surfaceflinger/SurfaceFlinger.cpp
diff options
context:
space:
mode:
author Ana Krulec <akrulec@google.com> 2018-10-12 13:44:41 -0700
committer Ana Krulec <akrulec@google.com> 2018-10-13 10:26:10 -0700
commit7ecce8c62d11b6a830bd9c68a71b6f842cac2e7c (patch)
treec4d6118a2a82d2063ee2d3778a81b976d095bcc0 /services/surfaceflinger/SurfaceFlinger.cpp
parent8dec3913042c8f199c79168980da8bfc78da97a1 (diff)
SF: Move TransactionStart from VsyncModulator to Scheduler
This is part of go/surface-flinger-scheduler. Test: SF tests pass. Change-Id: I45872aeb67603e15f1d5080d0b9440bc986579e4
Diffstat (limited to 'services/surfaceflinger/SurfaceFlinger.cpp')
-rw-r--r--services/surfaceflinger/SurfaceFlinger.cpp9
1 files changed, 4 insertions, 5 deletions
diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 5744266026..23281c2757 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3372,11 +3372,11 @@ uint32_t SurfaceFlinger::getTransactionFlags(uint32_t flags) {
}
uint32_t SurfaceFlinger::setTransactionFlags(uint32_t flags) {
- return setTransactionFlags(flags, VSyncModulator::TransactionStart::NORMAL);
+ return setTransactionFlags(flags, Scheduler::TransactionStart::NORMAL);
}
uint32_t SurfaceFlinger::setTransactionFlags(uint32_t flags,
- VSyncModulator::TransactionStart transactionStart) {
+ Scheduler::TransactionStart transactionStart) {
uint32_t old = mTransactionFlags.fetch_or(flags);
mVsyncModulator.setTransactionStart(transactionStart);
if ((old & flags)==0) { // wake the server up
@@ -3467,9 +3467,8 @@ void SurfaceFlinger::setTransactionState(
}
// this triggers the transaction
- const auto start = (flags & eEarlyWakeup)
- ? VSyncModulator::TransactionStart::EARLY
- : VSyncModulator::TransactionStart::NORMAL;
+ const auto start = (flags & eEarlyWakeup) ? Scheduler::TransactionStart::EARLY
+ : Scheduler::TransactionStart::NORMAL;
setTransactionFlags(transactionFlags, start);
// if this is a synchronous transaction, wait for it to take effect