Merge "ANativeWindow: support for application buffer dimensions"

This commit is contained in:
Jamie Gennis
2012-04-11 18:52:12 -07:00
committed by Android (Google) Code Review

View File

@@ -60,13 +60,16 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window) {
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width,
int32_t height, int32_t format) {
int32_t err = native_window_set_buffers_geometry(window, width, height, format);
int32_t err = native_window_set_buffers_format(window, format);
if (!err) {
int mode = NATIVE_WINDOW_SCALING_MODE_FREEZE;
if (width && height) {
mode = NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW;
}
err = native_window_set_scaling_mode(window, mode);
err = native_window_set_buffers_user_dimensions(window, width, height);
if (!err) {
int mode = NATIVE_WINDOW_SCALING_MODE_FREEZE;
if (width && height) {
mode = NATIVE_WINDOW_SCALING_MODE_SCALE_TO_WINDOW;
}
err = native_window_set_scaling_mode(window, mode);
}
}
return err;
}