am 5219dd8e: Merge "add format parameter to setBufferGeometry" into gingerbread

This commit is contained in:
Mathias Agopian
2010-10-26 12:19:48 -07:00
committed by Android Git Automerger
2 changed files with 3 additions and 3 deletions

View File

@ -58,8 +58,8 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window) {
}
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width,
int32_t height) {
native_window_set_buffers_geometry(window, width, height, 0);
int32_t height, int32_t format) {
native_window_set_buffers_geometry(window, width, height, format);
return 0;
}

View File

@ -96,7 +96,7 @@ int32_t ANativeWindow_getFormat(ANativeWindow* window);
* For all of these parameters, if 0 is supplied then the window's base
* value will come back in force.
*/
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height);
int32_t ANativeWindow_setBuffersGeometry(ANativeWindow* window, int32_t width, int32_t height, int32_t format);
/**
* Lock the window's next drawing surface for writing.