Fix usage of HWC_DISPLAY_PRIMARY in vr flinger
The hardware composer functions require display ids obtained from the
onHotplug() composer callback. Our vr flinger code was supplying
HWC_DISPLAY_PRIMARY as the primary display id, which is incorrect. The
HWC_DISPLAY_* values are used for representing the display type, not the
display id. The code worked anyway because most hardware composers
always use 0 as the primary display id, which happens to be the same
value as HWC_DISPLAY_PRIMARY. The emulator uses 1 as the primary display
id though, which exposed the bug.
This CL changes the vr flinger code to get the display id from the
onHotplug() composer callback, and uses that value when talking to
hardware composer, instead of HWC_DISPLAY_PRIMARY. This matches the
behavior of surface flinger.
Bug: 69631196
Test: Verified the vr flinger code path works as expected on phones and
standalones.
Change-Id: Ia691941d0eafaa1f89e0ee81a4ae27fdef5a57cf
diff --git a/libs/vr/libvrflinger/vsync_service.h b/libs/vr/libvrflinger/vsync_service.h
index 215948e..822f02b 100644
--- a/libs/vr/libvrflinger/vsync_service.h
+++ b/libs/vr/libvrflinger/vsync_service.h
@@ -63,9 +63,10 @@
const std::shared_ptr<pdx::Channel>& channel) override;
// Called by the hardware composer HAL, or similar, whenever a vsync event
- // occurs. |compositor_time_ns| is the number of ns before the next vsync when
- // the compositor will preempt the GPU to do EDS and lens warp.
- void VSyncEvent(int display, int64_t timestamp_ns, int64_t compositor_time_ns,
+ // occurs on the primary display. |compositor_time_ns| is the number of ns
+ // before the next vsync when the compositor will preempt the GPU to do EDS
+ // and lens warp.
+ void VSyncEvent(int64_t timestamp_ns, int64_t compositor_time_ns,
uint32_t vsync_count);
private: