diff options
author | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-01 12:42:53 +0100 |
---|---|---|
committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-23 12:07:47 +0100 |
commit | 38ef6f5f6019e168f584d99f94bc675afbb0b33a (patch) | |
tree | 736d6479f66b8bd191e77f25376cc90ceead3dc7 /src/egl/drivers/dri2 | |
parent | 2cd687ce97f39bd98fab4d72d607b7a1644cd2a0 (diff) | |
download | external_mesa3d-38ef6f5f6019e168f584d99f94bc675afbb0b33a.zip external_mesa3d-38ef6f5f6019e168f584d99f94bc675afbb0b33a.tar.gz external_mesa3d-38ef6f5f6019e168f584d99f94bc675afbb0b33a.tar.bz2 |
egl: android: directly use dri2_create_image_dma_buf()
Make the function non static so that we can use it directly from the
android platform code.
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Acked-by: Rob Herring <robh@kernel.org>
Diffstat (limited to 'src/egl/drivers/dri2')
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 2 | ||||
-rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 4 | ||||
-rw-r--r-- | src/egl/drivers/dri2/platform_android.c | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 65a3a62..6dcfd49 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -1960,7 +1960,7 @@ dri2_check_dma_buf_format(const _EGLImageAttribs *attrs) * * Therefore we must never close or otherwise modify the file descriptors. */ -static _EGLImage * +_EGLImage * dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, EGLClientBuffer buffer, const EGLint *attr_list) { diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index ddb5f39..925294b 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -361,6 +361,10 @@ dri2_create_image_khr(_EGLDriver *drv, _EGLDisplay *disp, _EGLContext *ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attr_list); +_EGLImage * +dri2_create_image_dma_buf(_EGLDisplay *disp, _EGLContext *ctx, + EGLClientBuffer buffer, const EGLint *attr_list); + EGLBoolean dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp); diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c index c837b35..9f0f133 100644 --- a/src/egl/drivers/dri2/platform_android.c +++ b/src/egl/drivers/dri2/platform_android.c @@ -494,8 +494,7 @@ dri2_create_image_android_native_buffer(_EGLDriver *drv, _EGLDisplay *disp, if (fourcc == -1 || pitch == 0) return NULL; - return dri2_create_image_khr(drv, disp, ctx, EGL_LINUX_DMA_BUF_EXT, - NULL, attr_list); + return dri2_create_image_dma_buf(disp, ctx, NULL, attr_list); } name = get_native_buffer_name(buf); |