summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSean V Kelley <[email protected]>2012-04-24 07:49:09 -0700
committerChad Versace <[email protected]>2012-04-30 11:22:46 -0700
commit81f95ce13d92f15df2941a831ddb5a415f0f816e (patch)
treea39af63da0fe24900cb5d2ab18d8864bde3b9636
parent1de377bd307f3c4aa63f1a14a693f81af54d56ee (diff)
egl/android: Add support for RGBX_8888 used in Android native buffers
Add new format __DRI_IMAGE_FORMAT_XBGR8888 to __DRI_IMAGE. HAL_PIXEL_FORMAT_RGBX_8888 now maps to __DRI_IMAGE_FORMAT_XBGR8888. Signed-off-by: Sean V Kelley <[email protected]> Signed-off-by: Chad Versace <[email protected]>
-rw-r--r--include/GL/internal/dri_interface.h1
-rw-r--r--src/egl/drivers/dri2/platform_android.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/include/GL/internal/dri_interface.h b/include/GL/internal/dri_interface.h
index da8366652fe..eafbe10f9b0 100644
--- a/include/GL/internal/dri_interface.h
+++ b/include/GL/internal/dri_interface.h
@@ -906,6 +906,7 @@ struct __DRIdri2ExtensionRec {
#define __DRI_IMAGE_FORMAT_XRGB8888 0x1002
#define __DRI_IMAGE_FORMAT_ARGB8888 0x1003
#define __DRI_IMAGE_FORMAT_ABGR8888 0x1004
+#define __DRI_IMAGE_FORMAT_XBGR8888 0x1005
#define __DRI_IMAGE_USE_SHARE 0x0001
#define __DRI_IMAGE_USE_SCANOUT 0x0002
diff --git a/src/egl/drivers/dri2/platform_android.c b/src/egl/drivers/dri2/platform_android.c
index 1998941f829..66142cdee5f 100644
--- a/src/egl/drivers/dri2/platform_android.c
+++ b/src/egl/drivers/dri2/platform_android.c
@@ -311,6 +311,8 @@ dri2_create_image_android_native_buffer(_EGLDisplay *disp,
format = __DRI_IMAGE_FORMAT_ABGR8888;
break;
case HAL_PIXEL_FORMAT_RGBX_8888:
+ format = __DRI_IMAGE_FORMAT_XBGR8888;
+ break;
case HAL_PIXEL_FORMAT_RGB_888:
case HAL_PIXEL_FORMAT_RGBA_5551:
case HAL_PIXEL_FORMAT_RGBA_4444: