fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 02:30:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/dri: replace format conversion functions with single mapping table

Browse source 
Each time I have to touch the buffer import/export functions in the dri
state tracker I get lost in the maze of functions converting between
DRI_IMAGE_FOURCC, DRI_IMAGE_FORMAT, DRI_IMAGE_COMPONENTS and pipe format.

Rip it out and replace by a single table, which defines the correspondence
between the different representations.

Also this now stores all the known representations in the __DRIimageRec,
to avoid the loss of information we currently have when importing a buffer
with a fourcc, which doesn't have a corresponding dri format.

Signed-off-by: Lucas Stach <l.stach@pengutronix.de>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Lucas Stach 2018-05-17 11:03:57 +02:00
parent 67174d40f1
commit 433ca3127a
2 changed files with 151 additions and 354 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

502
src/gallium/state_trackers/dri/dri2.c
View file

@ -66,305 +66,72 @@ dri2_buffer(__DRIbuffer * driBufferPriv)
return (struct dri2_buffer *) driBufferPriv; return (struct dri2_buffer *) driBufferPriv;
} }
static const int fourcc_formats[] = { struct dri2_format_mapping {
__DRI_IMAGE_FOURCC_ARGB2101010, int dri_fourcc;
__DRI_IMAGE_FOURCC_XRGB2101010, int dri_format;
__DRI_IMAGE_FOURCC_ABGR2101010, int dri_components;
__DRI_IMAGE_FOURCC_XBGR2101010, enum pipe_format pipe_format;
__DRI_IMAGE_FOURCC_ARGB8888,
__DRI_IMAGE_FOURCC_ABGR8888,
__DRI_IMAGE_FOURCC_SARGB8888,
__DRI_IMAGE_FOURCC_XRGB8888,
__DRI_IMAGE_FOURCC_XBGR8888,
__DRI_IMAGE_FOURCC_ARGB1555,
__DRI_IMAGE_FOURCC_RGB565,
__DRI_IMAGE_FOURCC_R8,
__DRI_IMAGE_FOURCC_R16,
__DRI_IMAGE_FOURCC_GR88,
__DRI_IMAGE_FOURCC_GR1616,
__DRI_IMAGE_FOURCC_YUV410,
__DRI_IMAGE_FOURCC_YUV411,
__DRI_IMAGE_FOURCC_YUV420,
__DRI_IMAGE_FOURCC_YUV422,
__DRI_IMAGE_FOURCC_YUV444,
__DRI_IMAGE_FOURCC_YVU410,
__DRI_IMAGE_FOURCC_YVU411,
__DRI_IMAGE_FOURCC_YVU420,
__DRI_IMAGE_FOURCC_YVU422,
__DRI_IMAGE_FOURCC_YVU444,
__DRI_IMAGE_FOURCC_NV12,
__DRI_IMAGE_FOURCC_NV16,
__DRI_IMAGE_FOURCC_YUYV
}; };
static int convert_fourcc(int format, int *dri_components_p) static const struct dri2_format_mapping dri2_format_table[] = {
{ { __DRI_IMAGE_FOURCC_ARGB2101010, __DRI_IMAGE_FORMAT_ARGB2101010,
int dri_components; __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_B10G10R10A2_UNORM },
switch(format) { { __DRI_IMAGE_FOURCC_XRGB2101010, __DRI_IMAGE_FORMAT_XRGB2101010,
case __DRI_IMAGE_FOURCC_ARGB1555: __DRI_IMAGE_COMPONENTS_RGB, PIPE_FORMAT_B10G10R10X2_UNORM },
format = __DRI_IMAGE_FORMAT_ARGB1555; { __DRI_IMAGE_FOURCC_ABGR2101010, __DRI_IMAGE_FORMAT_ABGR2101010,
dri_components = __DRI_IMAGE_COMPONENTS_RGBA; __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_R10G10B10A2_UNORM },
break; { __DRI_IMAGE_FOURCC_XBGR2101010, __DRI_IMAGE_FORMAT_XBGR2101010,
case __DRI_IMAGE_FOURCC_RGB565: __DRI_IMAGE_COMPONENTS_RGB, PIPE_FORMAT_R10G10B10X2_UNORM },
format = __DRI_IMAGE_FORMAT_RGB565; { __DRI_IMAGE_FOURCC_ARGB8888, __DRI_IMAGE_FORMAT_ARGB8888,
dri_components = __DRI_IMAGE_COMPONENTS_RGB; __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_BGRA8888_UNORM },
break; { __DRI_IMAGE_FOURCC_ABGR8888, __DRI_IMAGE_FORMAT_ABGR8888,
case __DRI_IMAGE_FOURCC_ARGB8888: __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_RGBA8888_UNORM },
format = __DRI_IMAGE_FORMAT_ARGB8888; { __DRI_IMAGE_FOURCC_SARGB8888, __DRI_IMAGE_FORMAT_SARGB8,
dri_components = __DRI_IMAGE_COMPONENTS_RGBA; __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_BGRA8888_SRGB },
break; { __DRI_IMAGE_FOURCC_XRGB8888, __DRI_IMAGE_FORMAT_XRGB8888,
case __DRI_IMAGE_FOURCC_XRGB8888: __DRI_IMAGE_COMPONENTS_RGB, PIPE_FORMAT_BGRX8888_UNORM },
format = __DRI_IMAGE_FORMAT_XRGB8888; { __DRI_IMAGE_FOURCC_XBGR8888, __DRI_IMAGE_FORMAT_XBGR8888,
dri_components = __DRI_IMAGE_COMPONENTS_RGB; __DRI_IMAGE_COMPONENTS_RGB, PIPE_FORMAT_RGBX8888_UNORM },
break; { __DRI_IMAGE_FOURCC_ARGB1555, __DRI_IMAGE_FORMAT_RGB565,
case __DRI_IMAGE_FOURCC_ABGR8888: __DRI_IMAGE_COMPONENTS_RGBA, PIPE_FORMAT_B5G5R5A1_UNORM },
format = __DRI_IMAGE_FORMAT_ABGR8888; { __DRI_IMAGE_FOURCC_RGB565, __DRI_IMAGE_FORMAT_RGB565,
dri_components = __DRI_IMAGE_COMPONENTS_RGBA; __DRI_IMAGE_COMPONENTS_RGB, PIPE_FORMAT_B5G6R5_UNORM },
break; { __DRI_IMAGE_FOURCC_R8, __DRI_IMAGE_FORMAT_R8,
case __DRI_IMAGE_FOURCC_XBGR8888: __DRI_IMAGE_COMPONENTS_R, PIPE_FORMAT_R8_UNORM },
format = __DRI_IMAGE_FORMAT_XBGR8888; { __DRI_IMAGE_FOURCC_R16, __DRI_IMAGE_FORMAT_R16,
dri_components = __DRI_IMAGE_COMPONENTS_RGB; __DRI_IMAGE_COMPONENTS_R, PIPE_FORMAT_R16_UNORM },
break; { __DRI_IMAGE_FOURCC_GR88, __DRI_IMAGE_FORMAT_GR88,
case __DRI_IMAGE_FOURCC_ARGB2101010: __DRI_IMAGE_COMPONENTS_RG, PIPE_FORMAT_RG88_UNORM },
format = __DRI_IMAGE_FORMAT_ARGB2101010; { __DRI_IMAGE_FOURCC_GR1616, __DRI_IMAGE_FORMAT_GR88,
dri_components = __DRI_IMAGE_COMPONENTS_RGBA; __DRI_IMAGE_COMPONENTS_RG, PIPE_FORMAT_RG1616_UNORM },
break; { __DRI_IMAGE_FOURCC_YUV420, __DRI_IMAGE_FORMAT_NONE,
case __DRI_IMAGE_FOURCC_XRGB2101010: __DRI_IMAGE_COMPONENTS_Y_U_V, PIPE_FORMAT_IYUV },
format = __DRI_IMAGE_FORMAT_XRGB2101010; { __DRI_IMAGE_FOURCC_YVU420, __DRI_IMAGE_FORMAT_NONE,
dri_components = __DRI_IMAGE_COMPONENTS_RGB; __DRI_IMAGE_COMPONENTS_Y_U_V, PIPE_FORMAT_YV12 },
break; { __DRI_IMAGE_FOURCC_NV12, __DRI_IMAGE_FORMAT_NONE,
case __DRI_IMAGE_FOURCC_ABGR2101010: __DRI_IMAGE_COMPONENTS_Y_UV, PIPE_FORMAT_NV12 },
format = __DRI_IMAGE_FORMAT_ABGR2101010; { __DRI_IMAGE_FOURCC_YUYV, __DRI_IMAGE_FORMAT_YUYV,
dri_components = __DRI_IMAGE_COMPONENTS_RGBA; __DRI_IMAGE_COMPONENTS_Y_XUXV, PIPE_FORMAT_YUYV },
break; };
case __DRI_IMAGE_FOURCC_XBGR2101010:
format = __DRI_IMAGE_FORMAT_XBGR2101010; static const struct dri2_format_mapping *
dri_components = __DRI_IMAGE_COMPONENTS_RGB; dri2_get_mapping_by_fourcc(int fourcc) {
break; for (unsigned i = 0; i < ARRAY_SIZE(dri2_format_table); i++) {
case __DRI_IMAGE_FOURCC_R8: if (dri2_format_table[i].dri_fourcc == fourcc)
format = __DRI_IMAGE_FORMAT_R8; return &dri2_format_table[i];
dri_components = __DRI_IMAGE_COMPONENTS_R;
break;
case __DRI_IMAGE_FOURCC_GR88:
format = __DRI_IMAGE_FORMAT_GR88;
dri_components = __DRI_IMAGE_COMPONENTS_RG;
break;
case __DRI_IMAGE_FOURCC_R16:
format = __DRI_IMAGE_FORMAT_R16;
dri_components = __DRI_IMAGE_COMPONENTS_R;
break;
case __DRI_IMAGE_FOURCC_GR1616:
format = __DRI_IMAGE_FORMAT_GR1616;
dri_components = __DRI_IMAGE_COMPONENTS_RG;
break;
case __DRI_IMAGE_FOURCC_YUYV:
format = __DRI_IMAGE_FORMAT_YUYV;
dri_components = __DRI_IMAGE_COMPONENTS_Y_XUXV;
break;
/*
* For multi-planar YUV formats, we return the format of the first
* plane only. Since there is only one caller which supports multi-
* planar YUV it gets to figure out the remaining planes on it's
* own.
*/
case __DRI_IMAGE_FOURCC_YUV420:
case __DRI_IMAGE_FOURCC_YVU420:
format = __DRI_IMAGE_FORMAT_R8;
dri_components = __DRI_IMAGE_COMPONENTS_Y_U_V;
break;
case __DRI_IMAGE_FOURCC_NV12:
format = __DRI_IMAGE_FORMAT_R8;
dri_components = __DRI_IMAGE_COMPONENTS_Y_UV;
break;
default:
return -1;
}
*dri_components_p = dri_components;
return format;
} }
/* NOTE this probably isn't going to do the right thing for YUV images return NULL;
* (but I think the same can be said for intel_query_image()). I think
* only needed for exporting dmabuf's, so I think I won't loose much
* sleep over it.
*/
static int convert_to_fourcc(int format)
{
switch(format) {
case __DRI_IMAGE_FORMAT_ARGB1555:
format = __DRI_IMAGE_FOURCC_ARGB1555;
break;
case __DRI_IMAGE_FORMAT_RGB565:
format = __DRI_IMAGE_FOURCC_RGB565;
break;
case __DRI_IMAGE_FORMAT_ARGB8888:
format = __DRI_IMAGE_FOURCC_ARGB8888;
break;
case __DRI_IMAGE_FORMAT_XRGB8888:
format = __DRI_IMAGE_FOURCC_XRGB8888;
break;
case __DRI_IMAGE_FORMAT_ABGR8888:
format = __DRI_IMAGE_FOURCC_ABGR8888;
break;
case __DRI_IMAGE_FORMAT_XBGR8888:
format = __DRI_IMAGE_FOURCC_XBGR8888;
break;
case __DRI_IMAGE_FORMAT_ARGB2101010:
format = __DRI_IMAGE_FOURCC_ARGB2101010;
break;
case __DRI_IMAGE_FORMAT_XRGB2101010:
format = __DRI_IMAGE_FOURCC_XRGB2101010;
break;
case __DRI_IMAGE_FORMAT_ABGR2101010:
format = __DRI_IMAGE_FOURCC_ABGR2101010;
break;
case __DRI_IMAGE_FORMAT_XBGR2101010:
format = __DRI_IMAGE_FOURCC_XBGR2101010;
break;
case __DRI_IMAGE_FORMAT_R8:
format = __DRI_IMAGE_FOURCC_R8;
break;
case __DRI_IMAGE_FORMAT_GR88:
format = __DRI_IMAGE_FOURCC_GR88;
break;
default:
return -1;
}
return format;
} }
static enum pipe_format dri2_format_to_pipe_format (int format) static const struct dri2_format_mapping *
{ dri2_get_mapping_by_format(int format) {
enum pipe_format pf; for (unsigned i = 0; i < ARRAY_SIZE(dri2_format_table); i++) {
if (dri2_format_table[i].dri_format == format)
switch (format) { return &dri2_format_table[i];
case __DRI_IMAGE_FORMAT_ARGB1555:
pf = PIPE_FORMAT_B5G5R5A1_UNORM;
break;
case __DRI_IMAGE_FORMAT_RGB565:
pf = PIPE_FORMAT_B5G6R5_UNORM;
break;
case __DRI_IMAGE_FORMAT_XRGB8888:
pf = PIPE_FORMAT_BGRX8888_UNORM;
break;
case __DRI_IMAGE_FORMAT_ARGB8888:
pf = PIPE_FORMAT_BGRA8888_UNORM;
break;
case __DRI_IMAGE_FORMAT_XBGR8888:
pf = PIPE_FORMAT_RGBX8888_UNORM;
break;
case __DRI_IMAGE_FORMAT_ABGR8888:
pf = PIPE_FORMAT_RGBA8888_UNORM;
break;
case __DRI_IMAGE_FORMAT_XRGB2101010:
pf = PIPE_FORMAT_B10G10R10X2_UNORM;
break;
case __DRI_IMAGE_FORMAT_ARGB2101010:
pf = PIPE_FORMAT_B10G10R10A2_UNORM;
break;
case __DRI_IMAGE_FORMAT_XBGR2101010:
pf = PIPE_FORMAT_R10G10B10X2_UNORM;
break;
case __DRI_IMAGE_FORMAT_ABGR2101010:
pf = PIPE_FORMAT_R10G10B10A2_UNORM;
break;
case __DRI_IMAGE_FORMAT_R8:
pf = PIPE_FORMAT_R8_UNORM;
break;
case __DRI_IMAGE_FORMAT_GR88:
pf = PIPE_FORMAT_RG88_UNORM;
break;
case __DRI_IMAGE_FORMAT_R16:
pf = PIPE_FORMAT_R16_UNORM;
break;
case __DRI_IMAGE_FORMAT_GR1616:
pf = PIPE_FORMAT_R16G16_UNORM;
break;
case __DRI_IMAGE_FORMAT_YUYV:
pf = PIPE_FORMAT_YUYV;
break;
default:
pf = PIPE_FORMAT_NONE;
break;
} }
return pf; return NULL;
}
static enum pipe_format fourcc_to_pipe_format(int fourcc)
{
enum pipe_format pf;
switch (fourcc) {
case __DRI_IMAGE_FOURCC_R8:
pf = PIPE_FORMAT_R8_UNORM;
break;
case __DRI_IMAGE_FOURCC_GR88:
pf = PIPE_FORMAT_RG88_UNORM;
break;
case __DRI_IMAGE_FOURCC_ARGB1555:
pf = PIPE_FORMAT_B5G5R5A1_UNORM;
break;
case __DRI_IMAGE_FOURCC_R16:
pf = PIPE_FORMAT_R16_UNORM;
break;
case __DRI_IMAGE_FOURCC_GR1616:
pf = PIPE_FORMAT_RG1616_UNORM;
break;
case __DRI_IMAGE_FOURCC_RGB565:
pf = PIPE_FORMAT_B5G6R5_UNORM;
break;
case __DRI_IMAGE_FOURCC_ARGB8888:
pf = PIPE_FORMAT_BGRA8888_UNORM;
break;
case __DRI_IMAGE_FOURCC_XRGB8888:
pf = PIPE_FORMAT_BGRX8888_UNORM;
break;
case __DRI_IMAGE_FOURCC_ABGR8888:
pf = PIPE_FORMAT_RGBA8888_UNORM;
break;
case __DRI_IMAGE_FOURCC_XBGR8888:
pf = PIPE_FORMAT_RGBX8888_UNORM;
break;
case __DRI_IMAGE_FOURCC_ARGB2101010:
pf = PIPE_FORMAT_B10G10R10A2_UNORM;
break;
case __DRI_IMAGE_FOURCC_XRGB2101010:
pf = PIPE_FORMAT_B10G10R10X2_UNORM;
break;
case __DRI_IMAGE_FOURCC_ABGR2101010:
pf = PIPE_FORMAT_R10G10B10A2_UNORM;
break;
case __DRI_IMAGE_FOURCC_XBGR2101010:
pf = PIPE_FORMAT_R10G10B10X2_UNORM;
break;
case __DRI_IMAGE_FOURCC_NV12:
pf = PIPE_FORMAT_NV12;
break;
case __DRI_IMAGE_FOURCC_YUYV:
pf = PIPE_FORMAT_YUYV;
break;
case __DRI_IMAGE_FOURCC_YUV420:
case __DRI_IMAGE_FOURCC_YVU420:
pf = PIPE_FORMAT_YV12;
break;
case __DRI_IMAGE_FOURCC_SARGB8888:
case __DRI_IMAGE_FOURCC_YUV410:
case __DRI_IMAGE_FOURCC_YUV411:
case __DRI_IMAGE_FOURCC_YUV422:
case __DRI_IMAGE_FOURCC_YUV444:
case __DRI_IMAGE_FOURCC_NV16:
case __DRI_IMAGE_FOURCC_YVU410:
case __DRI_IMAGE_FOURCC_YVU411:
case __DRI_IMAGE_FOURCC_YVU422:
case __DRI_IMAGE_FOURCC_YVU444:
default:
pf = PIPE_FORMAT_NONE;
}
return pf;
} }
/** /**
@ -1011,7 +778,7 @@ dri2_update_tex_buffer(struct dri_drawable *drawable,
static __DRIimage * static __DRIimage *
dri2_create_image_from_winsys(__DRIscreen *_screen, dri2_create_image_from_winsys(__DRIscreen *_screen,
int width, int height, int format, int width, int height, enum pipe_format pf,
int num_handles, struct winsys_handle *whandle, int num_handles, struct winsys_handle *whandle,
void *loaderPrivate) void *loaderPrivate)
{ {
@ -1020,13 +787,8 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
__DRIimage *img; __DRIimage *img;
struct pipe_resource templ; struct pipe_resource templ;
unsigned tex_usage = 0; unsigned tex_usage = 0;
enum pipe_format pf;
int i; int i;
pf = dri2_format_to_pipe_format (format);
if (pf == PIPE_FORMAT_NONE)
return NULL;
if (pscreen->is_format_supported(pscreen, pf, screen->target, 0, 0, if (pscreen->is_format_supported(pscreen, pf, screen->target, 0, 0,
PIPE_BIND_RENDER_TARGET)) PIPE_BIND_RENDER_TARGET))
tex_usage |= PIPE_BIND_RENDER_TARGET; tex_usage |= PIPE_BIND_RENDER_TARGET;
@ -1034,6 +796,20 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
PIPE_BIND_SAMPLER_VIEW)) PIPE_BIND_SAMPLER_VIEW))
tex_usage |= PIPE_BIND_SAMPLER_VIEW; tex_usage |= PIPE_BIND_SAMPLER_VIEW;
if (!tex_usage && util_format_is_yuv(pf)) {
/* YUV format sampling can be emulated by the Mesa state tracker by
* using multiple R8/RG88 samplers. So try to rewrite the pipe format.
*/
pf = PIPE_FORMAT_R8_UNORM;
if (pscreen->is_format_supported(pscreen, pf, screen->target, 0, 0,
PIPE_BIND_SAMPLER_VIEW))
tex_usage |= PIPE_BIND_SAMPLER_VIEW;
}
if (!tex_usage)
return NULL;
img = CALLOC_STRUCT(__DRIimageRec); img = CALLOC_STRUCT(__DRIimageRec);
if (!img) if (!img)
return NULL; return NULL;
@ -1085,7 +861,6 @@ dri2_create_image_from_winsys(__DRIscreen *_screen,
img->level = 0; img->level = 0;
img->layer = 0; img->layer = 0;
img->dri_format = format;
img->use = 0; img->use = 0;
img->loader_private = loaderPrivate; img->loader_private = loaderPrivate;
@ -1097,22 +872,31 @@ dri2_create_image_from_name(__DRIscreen *_screen,
int width, int height, int format, int width, int height, int format,
int name, int pitch, void *loaderPrivate) int name, int pitch, void *loaderPrivate)
{ {
const struct dri2_format_mapping *map = dri2_get_mapping_by_format(format);
struct winsys_handle whandle; struct winsys_handle whandle;
enum pipe_format pf; __DRIimage *img;
if (!map)
return NULL;
memset(&whandle, 0, sizeof(whandle)); memset(&whandle, 0, sizeof(whandle));
whandle.type = WINSYS_HANDLE_TYPE_SHARED; whandle.type = WINSYS_HANDLE_TYPE_SHARED;
whandle.handle = name; whandle.handle = name;
whandle.modifier = DRM_FORMAT_MOD_INVALID; whandle.modifier = DRM_FORMAT_MOD_INVALID;
pf = dri2_format_to_pipe_format (format); whandle.stride = pitch * util_format_get_blocksize(map->pipe_format);
if (pf == PIPE_FORMAT_NONE)
img = dri2_create_image_from_winsys(_screen, width, height, map->pipe_format,
1, &whandle, loaderPrivate);
if (!img)
return NULL; return NULL;
whandle.stride = pitch * util_format_get_blocksize(pf); img->dri_components = map->dri_components;
img->dri_fourcc = map->dri_fourcc;
img->dri_format = map->dri_format;
return dri2_create_image_from_winsys(_screen, width, height, format, return img;
1, &whandle, loaderPrivate);
} }
static __DRIimage * static __DRIimage *
@ -1120,14 +904,19 @@ dri2_create_image_from_fd(__DRIscreen *_screen,
int width, int height, int fourcc, int width, int height, int fourcc,
uint64_t modifier, int *fds, int num_fds, uint64_t modifier, int *fds, int num_fds,
int *strides, int *offsets, unsigned *error, int *strides, int *offsets, unsigned *error,
int *dri_components, void *loaderPrivate) void *loaderPrivate)
{ {
struct winsys_handle whandles[3]; struct winsys_handle whandles[3];
int format; const struct dri2_format_mapping *map = dri2_get_mapping_by_fourcc(fourcc);
__DRIimage *img = NULL; __DRIimage *img = NULL;
unsigned err = __DRI_IMAGE_ERROR_SUCCESS; unsigned err = __DRI_IMAGE_ERROR_SUCCESS;
int expected_num_fds, i; int expected_num_fds, i;
if (!map) {
err = __DRI_IMAGE_ERROR_BAD_MATCH;
goto exit;
}
switch (fourcc) { switch (fourcc) {
case __DRI_IMAGE_FOURCC_YUV420: case __DRI_IMAGE_FOURCC_YUV420:
case __DRI_IMAGE_FOURCC_YVU420: case __DRI_IMAGE_FOURCC_YVU420:
@ -1146,12 +935,6 @@ dri2_create_image_from_fd(__DRIscreen *_screen,
goto exit; goto exit;
} }
format = convert_fourcc(fourcc, dri_components);
if (format == -1) {
err = __DRI_IMAGE_ERROR_BAD_MATCH;
goto exit;
}
memset(whandles, 0, sizeof(whandles)); memset(whandles, 0, sizeof(whandles));
for (i = 0; i < num_fds; i++) { for (i = 0; i < num_fds; i++) {
@ -1173,12 +956,19 @@ dri2_create_image_from_fd(__DRIscreen *_screen,
whandles[1] = whandles[2]; whandles[1] = whandles[2];
whandles[2] = tmp; whandles[2] = tmp;
fourcc = __DRI_IMAGE_FOURCC_YUV420; fourcc = __DRI_IMAGE_FOURCC_YUV420;
map = dri2_get_mapping_by_fourcc(fourcc);
} }
img = dri2_create_image_from_winsys(_screen, width, height, format, img = dri2_create_image_from_winsys(_screen, width, height, map->pipe_format,
num_fds, whandles, loaderPrivate); num_fds, whandles, loaderPrivate);
if(img == NULL) if(img == NULL) {
err = __DRI_IMAGE_ERROR_BAD_ALLOC; err = __DRI_IMAGE_ERROR_BAD_ALLOC;
goto exit;
}
img->dri_components = map->dri_components;
img->dri_fourcc = fourcc;
img->dri_format = map->dri_format;
exit: exit:
if (error) if (error)
@ -1195,11 +985,14 @@ dri2_create_image_common(__DRIscreen *_screen,
const unsigned count, const unsigned count,
void *loaderPrivate) void *loaderPrivate)
{ {
const struct dri2_format_mapping *map = dri2_get_mapping_by_format(format);
struct dri_screen *screen = dri_screen(_screen); struct dri_screen *screen = dri_screen(_screen);
__DRIimage *img; __DRIimage *img;
struct pipe_resource templ; struct pipe_resource templ;
unsigned tex_usage; unsigned tex_usage;
enum pipe_format pf;
if (!map)
return NULL;
/* createImageWithModifiers doesn't supply usage, and we should not get /* createImageWithModifiers doesn't supply usage, and we should not get
* here with both modifiers and a usage flag. * here with both modifiers and a usage flag.
@ -1220,17 +1013,13 @@ dri2_create_image_common(__DRIscreen *_screen,
tex_usage |= PIPE_BIND_CURSOR; tex_usage |= PIPE_BIND_CURSOR;
} }
pf = dri2_format_to_pipe_format (format);
if (pf == PIPE_FORMAT_NONE)
return NULL;
img = CALLOC_STRUCT(__DRIimageRec); img = CALLOC_STRUCT(__DRIimageRec);
if (!img) if (!img)
return NULL; return NULL;
memset(&templ, 0, sizeof(templ)); memset(&templ, 0, sizeof(templ));
templ.bind = tex_usage; templ.bind = tex_usage;
templ.format = pf; templ.format = map->pipe_format;
templ.target = PIPE_TEXTURE_2D; templ.target = PIPE_TEXTURE_2D;
templ.last_level = 0; templ.last_level = 0;
templ.width0 = width; templ.width0 = width;
@ -1256,6 +1045,7 @@ dri2_create_image_common(__DRIscreen *_screen,
img->level = 0; img->level = 0;
img->layer = 0; img->layer = 0;
img->dri_format = format; img->dri_format = format;
img->dri_fourcc = map->dri_fourcc;
img->dri_components = 0; img->dri_components = 0;
img->use = use; img->use = use;
@ -1350,8 +1140,18 @@ dri2_query_image(__DRIimage *image, int attrib, int *value)
*value = image->dri_components; *value = image->dri_components;
return GL_TRUE; return GL_TRUE;
case __DRI_IMAGE_ATTRIB_FOURCC: case __DRI_IMAGE_ATTRIB_FOURCC:
*value = convert_to_fourcc(image->dri_format); if (image->dri_fourcc) {
return *value != -1; *value = image->dri_fourcc;
} else {
const struct dri2_format_mapping *map;
map = dri2_get_mapping_by_format(image->dri_format);
if (!map)
return GL_FALSE;
*value = map->dri_fourcc;
}
return GL_TRUE;
case __DRI_IMAGE_ATTRIB_NUM_PLANES: case __DRI_IMAGE_ATTRIB_NUM_PLANES:
*value = 1; *value = 1;
return GL_TRUE; return GL_TRUE;
@ -1434,15 +1234,14 @@ dri2_from_names(__DRIscreen *screen, int width, int height, int format,
int *names, int num_names, int *strides, int *offsets, int *names, int num_names, int *strides, int *offsets,
void *loaderPrivate) void *loaderPrivate)
{ {
const struct dri2_format_mapping *map = dri2_get_mapping_by_format(format);
__DRIimage *img; __DRIimage *img;
int dri_components;
struct winsys_handle whandle; struct winsys_handle whandle;
if (num_names != 1) if (!map)
return NULL; return NULL;
format = convert_fourcc(format, &dri_components); if (num_names != 1)
if (format == -1)
return NULL; return NULL;
memset(&whandle, 0, sizeof(whandle)); memset(&whandle, 0, sizeof(whandle));
@ -1452,12 +1251,15 @@ dri2_from_names(__DRIscreen *screen, int width, int height, int format,
whandle.offset = offsets[0]; whandle.offset = offsets[0];
whandle.modifier = DRM_FORMAT_MOD_INVALID; whandle.modifier = DRM_FORMAT_MOD_INVALID;
img = dri2_create_image_from_winsys(screen, width, height, format, img = dri2_create_image_from_winsys(screen, width, height, map->pipe_format,
1, &whandle, loaderPrivate); 1, &whandle, loaderPrivate);
if (img == NULL) if (img == NULL)
return NULL; return NULL;
img->dri_components = dri_components; img->dri_components = map->dri_components;
img->dri_fourcc = map->dri_fourcc;
img->dri_format = map->pipe_format;
return img; return img;
} }
@ -1490,18 +1292,9 @@ dri2_from_fds(__DRIscreen *screen, int width, int height, int fourcc,
int *fds, int num_fds, int *strides, int *offsets, int *fds, int num_fds, int *strides, int *offsets,
void *loaderPrivate) void *loaderPrivate)
{ {
__DRIimage *img; return dri2_create_image_from_fd(screen, width, height, fourcc,
int dri_components;
img = dri2_create_image_from_fd(screen, width, height, fourcc,
DRM_FORMAT_MOD_INVALID, fds, num_fds, DRM_FORMAT_MOD_INVALID, fds, num_fds,
strides, offsets, NULL, strides, offsets, NULL, loaderPrivate);
&dri_components, loaderPrivate);
if (img == NULL)
return NULL;
img->dri_components = dri_components;
return img;
} }
static boolean static boolean
@ -1512,22 +1305,24 @@ dri2_query_dma_buf_formats(__DRIscreen *_screen, int max, int *formats,
struct pipe_screen *pscreen = screen->base.screen; struct pipe_screen *pscreen = screen->base.screen;
int i, j; int i, j;
for (i = 0, j = 0; (i < ARRAY_SIZE(fourcc_formats)) && for (i = 0, j = 0; (i < ARRAY_SIZE(dri2_format_table)) &&
(j < max || max == 0); i++) { (j < max || max == 0); i++) {
enum pipe_format format = fourcc_to_pipe_format(fourcc_formats[i]); const struct dri2_format_mapping *map = &dri2_format_table[i];
/* The sRGB format is not a real FourCC as defined by drm_fourcc.h, so we /* The sRGB format is not a real FourCC as defined by drm_fourcc.h, so we
* must not leak it out to clients. * must not leak it out to clients.
*/ */
if (fourcc_formats[i] == __DRI_IMAGE_FOURCC_SARGB8888) if (dri2_format_table[i].dri_fourcc == __DRI_IMAGE_FOURCC_SARGB8888)
continue; continue;
if (pscreen->is_format_supported(pscreen, format, screen->target, 0, 0, if (pscreen->is_format_supported(pscreen, map->pipe_format,
screen->target, 0, 0,
PIPE_BIND_RENDER_TARGET) || PIPE_BIND_RENDER_TARGET) ||
pscreen->is_format_supported(pscreen, format, screen->target, 0, 0, pscreen->is_format_supported(pscreen, map->pipe_format,
screen->target, 0, 0,
PIPE_BIND_SAMPLER_VIEW)) { PIPE_BIND_SAMPLER_VIEW)) {
if (j < max) if (j < max)
formats[j] = fourcc_formats[i]; formats[j] = map->dri_fourcc;
j++; j++;
} }
} }
@ -1542,7 +1337,13 @@ dri2_query_dma_buf_modifiers(__DRIscreen *_screen, int fourcc, int max,
{ {
struct dri_screen *screen = dri_screen(_screen); struct dri_screen *screen = dri_screen(_screen);
struct pipe_screen *pscreen = screen->base.screen; struct pipe_screen *pscreen = screen->base.screen;
enum pipe_format format = fourcc_to_pipe_format(fourcc); const struct dri2_format_mapping *map = dri2_get_mapping_by_fourcc(fourcc);
enum pipe_format format;
if (!map)
return false;
format = map->pipe_format;
if (pscreen->query_dmabuf_modifiers != NULL && if (pscreen->query_dmabuf_modifiers != NULL &&
(pscreen->is_format_supported(pscreen, format, screen->target, 0, 0, (pscreen->is_format_supported(pscreen, format, screen->target, 0, 0,
@ -1569,12 +1370,10 @@ dri2_from_dma_bufs(__DRIscreen *screen,
void *loaderPrivate) void *loaderPrivate)
{ {
__DRIimage *img; __DRIimage *img;
int dri_components;
img = dri2_create_image_from_fd(screen, width, height, fourcc, img = dri2_create_image_from_fd(screen, width, height, fourcc,
DRM_FORMAT_MOD_INVALID, fds, num_fds, DRM_FORMAT_MOD_INVALID, fds, num_fds,
strides, offsets, error, strides, offsets, error, loaderPrivate);
&dri_components, loaderPrivate);
if (img == NULL) if (img == NULL)
return NULL; return NULL;
@ -1582,7 +1381,6 @@ dri2_from_dma_bufs(__DRIscreen *screen,
img->sample_range = sample_range; img->sample_range = sample_range;
img->horizontal_siting = horizontal_siting; img->horizontal_siting = horizontal_siting;
img->vertical_siting = vertical_siting; img->vertical_siting = vertical_siting;
img->dri_components = dri_components;
*error = __DRI_IMAGE_ERROR_SUCCESS; *error = __DRI_IMAGE_ERROR_SUCCESS;
return img; return img;
@ -1601,11 +1399,10 @@ dri2_from_dma_bufs2(__DRIscreen *screen,
void *loaderPrivate) void *loaderPrivate)
{ {
__DRIimage *img; __DRIimage *img;
int dri_components;
img = dri2_create_image_from_fd(screen, width, height, fourcc, img = dri2_create_image_from_fd(screen, width, height, fourcc,
modifier, fds, num_fds, strides, offsets, modifier, fds, num_fds, strides, offsets,
error, &dri_components, loaderPrivate); error, loaderPrivate);
if (img == NULL) if (img == NULL)
return NULL; return NULL;
@ -1613,7 +1410,6 @@ dri2_from_dma_bufs2(__DRIscreen *screen,
img->sample_range = sample_range; img->sample_range = sample_range;
img->horizontal_siting = horizontal_siting; img->horizontal_siting = horizontal_siting;
img->vertical_siting = vertical_siting; img->vertical_siting = vertical_siting;
img->dri_components = dri_components;
*error = __DRI_IMAGE_ERROR_SUCCESS; *error = __DRI_IMAGE_ERROR_SUCCESS;
return img; return img;

1
src/gallium/state_trackers/dri/dri_screen.h
View file

@ -103,6 +103,7 @@ struct __DRIimageRec {
unsigned level; unsigned level;
unsigned layer; unsigned layer;
uint32_t dri_format; uint32_t dri_format;
uint32_t dri_fourcc;
uint32_t dri_components; uint32_t dri_components;
unsigned use; unsigned use;