From 60591ee5dd7ed7c15e91eed084a0e18c1943f5ad Mon Sep 17 00:00:00 2001 From: "Sergey Semyonov (Serge)" Date: Sun, 31 Jan 2016 18:25:28 +0000 Subject: [PATCH] pixlib: planar images git-svn-id: svn://kolibrios.org@6115 a494cfbc-eb01-0410-851d-a64ba20cac60 --- contrib/sdk/sources/pixlib-3/pixdriver.h | 5 ++ contrib/sdk/sources/pixlib-3/pixlib3.c | 14 ++++ contrib/sdk/sources/pixlib-3/pixlib3.h | 9 +++ contrib/sdk/sources/pixlib-3/pxgl.c | 96 +++++++++++++++++++++++- contrib/sdk/sources/pixlib-3/pxgl.h | 13 ++++ 5 files changed, 135 insertions(+), 2 deletions(-) diff --git a/contrib/sdk/sources/pixlib-3/pixdriver.h b/contrib/sdk/sources/pixlib-3/pixdriver.h index b6381dba7e..f5a0021086 100644 --- a/contrib/sdk/sources/pixlib-3/pixdriver.h +++ b/contrib/sdk/sources/pixlib-3/pixdriver.h @@ -13,6 +13,11 @@ struct pix_driver int (*create_client)(int x, int y, uint32_t width, uint32_t height); int (*resize_client)(int x, int y, uint32_t width, uint32_t height); void (*fini)(void); + planar_t *(*create_planar)(int name, int format, + uint32_t width, uint32_t height, + uint32_t offset0, uint32_t pitch0, + uint32_t offset1, uint32_t pitch1, + uint32_t offset2, uint32_t pitch2); }; #endif diff --git a/contrib/sdk/sources/pixlib-3/pixlib3.c b/contrib/sdk/sources/pixlib-3/pixlib3.c index 54db5b8cf4..58df0910df 100644 --- a/contrib/sdk/sources/pixlib-3/pixlib3.c +++ b/contrib/sdk/sources/pixlib-3/pixlib3.c @@ -179,6 +179,7 @@ static struct pix_driver sw_driver = sw_blit, sw_create_client, sw_resize_client, + NULL, NULL }; @@ -255,6 +256,19 @@ void pxFini() }; +planar_t* pxCreatePlanar(int name, int format, + uint32_t width, uint32_t height, + uint32_t offset0, uint32_t pitch0, + uint32_t offset1, uint32_t pitch1, + uint32_t offset2, uint32_t pitch2) +{ + if(driver->create_planar) + return driver->create_planar(name, format, width, height, + offset0, pitch0, offset1, pitch1, + offset2, pitch2); + else + return NULL; +} diff --git a/contrib/sdk/sources/pixlib-3/pixlib3.h b/contrib/sdk/sources/pixlib-3/pixlib3.h index afab7aa6f6..936e1024d2 100644 --- a/contrib/sdk/sources/pixlib-3/pixlib3.h +++ b/contrib/sdk/sources/pixlib-3/pixlib3.h @@ -9,7 +9,10 @@ struct bitmap; +struct planar; + typedef struct bitmap bitmap_t; +typedef struct planar planar_t; uint32_t pxInit(int hw); void pxFini(); @@ -18,6 +21,12 @@ bitmap_t *pxCreateBitmap(uint32_t width, uint32_t height); int pxDestroyBitmap(bitmap_t *bitmap); +planar_t* pxCreatePlanar(int name, int format, + uint32_t width, uint32_t height, + uint32_t offset0, uint32_t pitch0, + uint32_t offset1, uint32_t pitch1, + uint32_t offset2, uint32_t pitch2); + void *pxLockBitmap(bitmap_t *bitmap, uint32_t *pitch); int pxResizeBitmap(bitmap_t *bitmap, uint32_t width, uint32_t height); diff --git a/contrib/sdk/sources/pixlib-3/pxgl.c b/contrib/sdk/sources/pixlib-3/pxgl.c index ff09b92123..fce1da2ce2 100644 --- a/contrib/sdk/sources/pixlib-3/pxgl.c +++ b/contrib/sdk/sources/pixlib-3/pxgl.c @@ -200,7 +200,6 @@ err_0: return NULL; }; - static int px_create_bitmap(struct render *px, struct bitmap *bitmap, size_t size, EGLint format) { @@ -527,6 +526,98 @@ err_0: return NULL; }; +static planar_t* hw_create_planar(EGLint name, EGLint format, uint32_t width, uint32_t height, + uint32_t offset0, uint32_t pitch0, + uint32_t offset1, uint32_t pitch1, + uint32_t offset2, uint32_t pitch2) +{ + struct drm_gem_close close; + planar_t *planar; + EGLImageKHR img; + int num_planes; + int i; + + EGLint attribs[] = { + EGL_WIDTH, width, + EGL_HEIGHT,height, + EGL_DRM_BUFFER_FORMAT_MESA, format, + EGL_DMA_BUF_PLANE0_OFFSET_EXT, offset0, + EGL_DMA_BUF_PLANE0_PITCH_EXT, pitch0, + EGL_DMA_BUF_PLANE1_OFFSET_EXT, offset1, + EGL_DMA_BUF_PLANE1_PITCH_EXT, pitch1, + EGL_DMA_BUF_PLANE2_OFFSET_EXT, offset2, + EGL_DMA_BUF_PLANE2_PITCH_EXT, pitch2, + EGL_NONE, EGL_NONE + }; + + switch (format) + { + case EGL_TEXTURE_Y_UV_WL: + num_planes = 2; + break; + case EGL_TEXTURE_Y_U_V_WL: + num_planes = 3; + break; + case EGL_TEXTURE_Y_XUXV_WL: + num_planes = 2; + break; + default: + num_planes = 0; + } + + if(num_planes == 0) + return NULL; + + planar = calloc(1, sizeof(struct planar)); + if(planar == NULL) + return NULL; + + img = eglCreatePlanarImage(px->dpy, px->context, (EGLClientBuffer)name, attribs); + if(img == NULL) + goto err_0; + + planar->width = width; + planar->height = height; + planar->name = name; + planar->planar_image = img; + + planar->offset[0] = offset0; + planar->offset[1] = offset1; + planar->offset[2] = offset2; + + planar->pitch[0] = pitch0; + planar->pitch[1] = pitch1; + planar->pitch[2] = pitch2; + + glGenTextures(num_planes, &planar->tex[0]); + + for(i = 0; i < num_planes; i++) + { + EGLint attr[3]; + attr[0] = EGL_WAYLAND_PLANE_WL; + attr[1] = i; + attr[2] = EGL_NONE; + + planar->image[i] = eglCreateImageKHR(px->dpy, px->context, + EGL_WAYLAND_BUFFER_WL,(EGLClientBuffer)name, attr); + + glBindTexture(GL_TEXTURE_2D, planar->tex[i]); + + glEGLImageTargetTexture2DOES(GL_TEXTURE_2D, planar->image[i]); + + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MIN_FILTER,GL_LINEAR); + glTexParameteri(GL_TEXTURE_2D,GL_TEXTURE_MAG_FILTER,GL_LINEAR); + }; + + return planar; + +err_0: + free(planar); + + return NULL; +} + + static int hw_destroy_bitmap(bitmap_t * bitmap) { struct drm_gem_close close; @@ -711,7 +802,8 @@ static struct pix_driver gl_driver = hw_blit, hw_create_client, hw_resize_client, - hw_fini + hw_fini, + hw_create_planar }; struct pix_driver *DrvInit(uint32_t service) diff --git a/contrib/sdk/sources/pixlib-3/pxgl.h b/contrib/sdk/sources/pixlib-3/pxgl.h index 6c71616639..bb689c5e97 100644 --- a/contrib/sdk/sources/pixlib-3/pxgl.h +++ b/contrib/sdk/sources/pixlib-3/pxgl.h @@ -6,6 +6,7 @@ #include "EGL/egl.h" #include "EGL/eglext.h" +#include "EGL/eglmesaext.h" #include "GL/gl.h" struct bitmap @@ -20,6 +21,18 @@ struct bitmap EGLImageKHR image; }; +struct planar +{ + uint32_t width; + uint32_t height; + GLuint name; + EGLImageKHR planar_image; + EGLImageKHR image[3]; + GLuint offset[3]; + GLuint pitch[3]; + GLuint tex[3]; +}; + enum { TEX_SCREEN = 0,