diff options
| author | Tapani Pälli <[email protected]> | 2018-03-19 13:41:44 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2018-04-24 14:55:18 +0300 |
| commit | fa4d4d97f3c968f3c8dce728c12f9e8597c93530 (patch) | |
| tree | 38cbb34654a9959679b87ca2a12213ee1bfa95bd /src | |
| parent | 4559aefb5cee5878198f8491680abe47df3e3250 (diff) | |
dri: Add __DRI_IMAGE_FORMAT_SABGR8
Add format definition and required plumbing to create images.
Note that there is no match to drm_fourcc definition, just like
with existing _DRI_IMAGE_FOURCC_SARGB8888.
Signed-off-by: Tapani Pälli <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/loader/loader_dri3_helper.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/dri_util.c | 4 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/utils.c | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/src/loader/loader_dri3_helper.c b/src/loader/loader_dri3_helper.c index fe17df14738..23729f7ecb2 100644 --- a/src/loader/loader_dri3_helper.c +++ b/src/loader/loader_dri3_helper.c @@ -1022,6 +1022,7 @@ dri3_cpp_for_format(uint32_t format) { case __DRI_IMAGE_FORMAT_XBGR2101010: case __DRI_IMAGE_FORMAT_ABGR2101010: case __DRI_IMAGE_FORMAT_SARGB8: + case __DRI_IMAGE_FORMAT_SABGR8: return 4; case __DRI_IMAGE_FORMAT_NONE: default: @@ -1041,6 +1042,7 @@ image_format_to_fourcc(int format) /* Convert from __DRI_IMAGE_FORMAT to __DRI_IMAGE_FOURCC (sigh) */ switch (format) { case __DRI_IMAGE_FORMAT_SARGB8: return __DRI_IMAGE_FOURCC_SARGB8888; + case __DRI_IMAGE_FORMAT_SABGR8: return __DRI_IMAGE_FOURCC_SABGR8888; case __DRI_IMAGE_FORMAT_RGB565: return __DRI_IMAGE_FOURCC_RGB565; case __DRI_IMAGE_FORMAT_XRGB8888: return __DRI_IMAGE_FOURCC_XRGB8888; case __DRI_IMAGE_FORMAT_ARGB8888: return __DRI_IMAGE_FOURCC_ARGB8888; diff --git a/src/mesa/drivers/dri/common/dri_util.c b/src/mesa/drivers/dri/common/dri_util.c index 0b94d19fa5d..7cb6248b130 100644 --- a/src/mesa/drivers/dri/common/dri_util.c +++ b/src/mesa/drivers/dri/common/dri_util.c @@ -900,6 +900,8 @@ driGLFormatToImageFormat(mesa_format format) return __DRI_IMAGE_FORMAT_GR88; case MESA_FORMAT_NONE: return __DRI_IMAGE_FORMAT_NONE; + case MESA_FORMAT_R8G8B8A8_SRGB: + return __DRI_IMAGE_FORMAT_SABGR8; case MESA_FORMAT_B8G8R8A8_SRGB: return __DRI_IMAGE_FORMAT_SARGB8; default: @@ -937,6 +939,8 @@ driImageFormatToGLFormat(uint32_t image_format) return MESA_FORMAT_R16G16_UNORM; case __DRI_IMAGE_FORMAT_SARGB8: return MESA_FORMAT_B8G8R8A8_SRGB; + case __DRI_IMAGE_FORMAT_SABGR8: + return MESA_FORMAT_R8G8B8A8_SRGB; case __DRI_IMAGE_FORMAT_NONE: return MESA_FORMAT_NONE; default: diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 1cffd3ad08e..fc5e2d19f34 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -208,6 +208,7 @@ driCreateConfigs(mesa_format format, masks = masks_table[2]; break; case MESA_FORMAT_R8G8B8A8_UNORM: + case MESA_FORMAT_R8G8B8A8_SRGB: masks = masks_table[5]; break; case MESA_FORMAT_R8G8B8X8_UNORM: |