summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian C. Anderson2017-01-16 19:09:47 -0600
committerAndroid (Google) Code Review2017-01-16 19:09:47 -0600
commiteccaae3659b48463ec62196319d393ccfbf508c7 (patch)
tree9fadbbadf23009fcacd6f074b75c1b960f03727b /include/system
parent96eec68729ff708da9862fe988591ca5aaa2bfc8 (diff)
parent693308866489370fbd1249b24a908798619fb6e2 (diff)
downloadplatform-system-core-eccaae3659b48463ec62196319d393ccfbf508c7.tar.gz
platform-system-core-eccaae3659b48463ec62196319d393ccfbf508c7.tar.xz
platform-system-core-eccaae3659b48463ec62196319d393ccfbf508c7.zip
Merge "Update native_window_get_frame_timestamps args"
Diffstat (limited to 'include/system')
-rw-r--r--include/system/window.h12
1 files changed, 7 insertions, 5 deletions
diff --git a/include/system/window.h b/include/system/window.h
index abd32823f..236de8d88 100644
--- a/include/system/window.h
+++ b/include/system/window.h
@@ -1027,14 +1027,16 @@ static inline int native_window_enable_frame_timestamps(
1027static inline int native_window_get_frame_timestamps( 1027static inline int native_window_get_frame_timestamps(
1028 struct ANativeWindow* window, uint32_t framesAgo, 1028 struct ANativeWindow* window, uint32_t framesAgo,
1029 int64_t* outRequestedPresentTime, int64_t* outAcquireTime, 1029 int64_t* outRequestedPresentTime, int64_t* outAcquireTime,
1030 int64_t* outRefreshStartTime, int64_t* outGlCompositionDoneTime, 1030 int64_t* outLatchTime, int64_t* outFirstRefreshStartTime,
1031 int64_t* outLastRefreshStartTime, int64_t* outGlCompositionDoneTime,
1031 int64_t* outDisplayPresentTime, int64_t* outDisplayRetireTime, 1032 int64_t* outDisplayPresentTime, int64_t* outDisplayRetireTime,
1032 int64_t* outReleaseTime) 1033 int64_t* outDequeueReadyTime, int64_t* outReleaseTime)
1033{ 1034{
1034 return window->perform(window, NATIVE_WINDOW_GET_FRAME_TIMESTAMPS, 1035 return window->perform(window, NATIVE_WINDOW_GET_FRAME_TIMESTAMPS,
1035 framesAgo, outRequestedPresentTime, outAcquireTime, 1036 framesAgo, outRequestedPresentTime, outAcquireTime, outLatchTime,
1036 outRefreshStartTime, outGlCompositionDoneTime, 1037 outFirstRefreshStartTime, outLastRefreshStartTime,
1037 outDisplayPresentTime, outDisplayRetireTime, outReleaseTime); 1038 outGlCompositionDoneTime, outDisplayPresentTime,
1039 outDisplayRetireTime, outDequeueReadyTime, outReleaseTime);
1038} 1040}
1039 1041
1040 1042