diff options
| author | Pablo Ceballos | 2016-03-28 14:34:27 -0500 |
|---|---|---|
| committer | Android (Google) Code Review | 2016-03-28 14:34:27 -0500 |
| commit | 0e28c1fa4a759755f21bf8a10d9e645ae64d1f78 (patch) | |
| tree | e043d70347226ff36367a3d395cb3aa649ff29ec /include/system | |
| parent | 197b62852b27021f2a388be7b6a49329a082c665 (diff) | |
| parent | 248e77156d65bb232480090a7eb953cdde63c354 (diff) | |
| download | platform-system-core-0e28c1fa4a759755f21bf8a10d9e645ae64d1f78.tar.gz platform-system-core-0e28c1fa4a759755f21bf8a10d9e645ae64d1f78.tar.xz platform-system-core-0e28c1fa4a759755f21bf8a10d9e645ae64d1f78.zip | |
Merge "Rename single buffer mode to shared buffer mode" into nyc-dev
Diffstat (limited to 'include/system')
| -rw-r--r-- | include/system/window.h | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/include/system/window.h b/include/system/window.h index 1ca093f62..b8f33ffd4 100644 --- a/include/system/window.h +++ b/include/system/window.h | |||
| @@ -312,7 +312,7 @@ enum { | |||
| 312 | NATIVE_WINDOW_SET_SIDEBAND_STREAM = 18, | 312 | NATIVE_WINDOW_SET_SIDEBAND_STREAM = 18, |
| 313 | NATIVE_WINDOW_SET_BUFFERS_DATASPACE = 19, | 313 | NATIVE_WINDOW_SET_BUFFERS_DATASPACE = 19, |
| 314 | NATIVE_WINDOW_SET_SURFACE_DAMAGE = 20, /* private */ | 314 | NATIVE_WINDOW_SET_SURFACE_DAMAGE = 20, /* private */ |
| 315 | NATIVE_WINDOW_SET_SINGLE_BUFFER_MODE = 21, | 315 | NATIVE_WINDOW_SET_SHARED_BUFFER_MODE = 21, |
| 316 | NATIVE_WINDOW_SET_AUTO_REFRESH = 22, | 316 | NATIVE_WINDOW_SET_AUTO_REFRESH = 22, |
| 317 | }; | 317 | }; |
| 318 | 318 | ||
| @@ -954,20 +954,20 @@ static inline int native_window_set_surface_damage( | |||
| 954 | } | 954 | } |
| 955 | 955 | ||
| 956 | /* | 956 | /* |
| 957 | * native_window_set_single_buffer_mode(..., bool singleBufferMode) | 957 | * native_window_set_shared_buffer_mode(..., bool sharedBufferMode) |
| 958 | * Enable/disable single buffer mode | 958 | * Enable/disable shared buffer mode |
| 959 | */ | 959 | */ |
| 960 | static inline int native_window_set_single_buffer_mode( | 960 | static inline int native_window_set_shared_buffer_mode( |
| 961 | struct ANativeWindow* window, | 961 | struct ANativeWindow* window, |
| 962 | bool singleBufferMode) | 962 | bool sharedBufferMode) |
| 963 | { | 963 | { |
| 964 | return window->perform(window, NATIVE_WINDOW_SET_SINGLE_BUFFER_MODE, | 964 | return window->perform(window, NATIVE_WINDOW_SET_SHARED_BUFFER_MODE, |
| 965 | singleBufferMode); | 965 | sharedBufferMode); |
| 966 | } | 966 | } |
| 967 | 967 | ||
| 968 | /* | 968 | /* |
| 969 | * native_window_set_auto_refresh(..., autoRefresh) | 969 | * native_window_set_auto_refresh(..., autoRefresh) |
| 970 | * Enable/disable auto refresh when in single buffer mode | 970 | * Enable/disable auto refresh when in shared buffer mode |
| 971 | */ | 971 | */ |
| 972 | static inline int native_window_set_auto_refresh( | 972 | static inline int native_window_set_auto_refresh( |
| 973 | struct ANativeWindow* window, | 973 | struct ANativeWindow* window, |