This patch is a simple refactor moving necessary code up the file, so that required functions are available to call in the code added in further patch.
Signed-off-by: Tomasz Figa <[email protected]> --- src/egl/drivers/dri2/platform_android.c | 70 ++++++++++++++++----------------- 1 file changed, 35 insertions(+), 35 deletions(-) diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index 6cbe119b02..14f0dd0310 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -154,6 +154,41 @@ get_native_buffer_name(struct ANativeWindowBuffer *buf) return gralloc_drm_get_gem_handle(buf->handle); } +static __DRIbuffer * +droid_alloc_local_buffer(struct dri2_egl_surface *dri2_surf, + unsigned int att, unsigned int format) +{ + struct dri2_egl_display *dri2_dpy = + dri2_egl_display(dri2_surf->base.Resource.Display); + + if (att >= ARRAY_SIZE(dri2_surf->local_buffers)) + return NULL; + + if (!dri2_surf->local_buffers[att]) { + dri2_surf->local_buffers[att] = + dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen, att, format, + dri2_surf->base.Width, dri2_surf->base.Height); + } + + return dri2_surf->local_buffers[att]; +} + +static void +droid_free_local_buffers(struct dri2_egl_surface *dri2_surf) +{ + struct dri2_egl_display *dri2_dpy = + dri2_egl_display(dri2_surf->base.Resource.Display); + int i; + + for (i = 0; i < ARRAY_SIZE(dri2_surf->local_buffers); i++) { + if (dri2_surf->local_buffers[i]) { + dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen, + dri2_surf->local_buffers[i]); + dri2_surf->local_buffers[i] = NULL; + } + } +} + static EGLBoolean droid_window_dequeue_buffer(struct dri2_egl_surface *dri2_surf) { @@ -270,41 +305,6 @@ droid_window_cancel_buffer(_EGLDisplay *disp, struct dri2_egl_surface *dri2_surf droid_window_enqueue_buffer(disp, dri2_surf); } -static __DRIbuffer * -droid_alloc_local_buffer(struct dri2_egl_surface *dri2_surf, - unsigned int att, unsigned int format) -{ - struct dri2_egl_display *dri2_dpy = - dri2_egl_display(dri2_surf->base.Resource.Display); - - if (att >= ARRAY_SIZE(dri2_surf->local_buffers)) - return NULL; - - if (!dri2_surf->local_buffers[att]) { - dri2_surf->local_buffers[att] = - dri2_dpy->dri2->allocateBuffer(dri2_dpy->dri_screen, att, format, - dri2_surf->base.Width, dri2_surf->base.Height); - } - - return dri2_surf->local_buffers[att]; -} - -static void -droid_free_local_buffers(struct dri2_egl_surface *dri2_surf) -{ - struct dri2_egl_display *dri2_dpy = - dri2_egl_display(dri2_surf->base.Resource.Display); - int i; - - for (i = 0; i < ARRAY_SIZE(dri2_surf->local_buffers); i++) { - if (dri2_surf->local_buffers[i]) { - dri2_dpy->dri2->releaseBuffer(dri2_dpy->dri_screen, - dri2_surf->local_buffers[i]); - dri2_surf->local_buffers[i] = NULL; - } - } -} - static _EGLSurface * droid_create_surface(_EGLDriver *drv, _EGLDisplay *disp, EGLint type, _EGLConfig *conf, void *native_window, -- 2.12.2.816.g2cccc81164-goog _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
