diff options
author | Sean V Kelley <sean.v.kelley@intel.com> | 2012-09-10 11:52:35 -0700 |
---|---|---|
committer | Chih-Wei Huang <cwhuang@linux.org.tw> | 2013-07-23 23:30:49 +0800 |
commit | 604d73de886465ad7ab53ee2586e7de7eb6b6e2c (patch) | |
tree | 179d7c685ad36df7010c6ff7b004f66e9adf8ad0 | |
parent | c505b6b604965603184d6e8fd870bd0566282503 (diff) |
i915: Support Android RGBX8888 format for EGL generated images
Enabled MESA_FORMAT_RGBX8888_REV for RGBX with i915. Android software
requires RGBX8888 format to be supported for software rendering.
Previously had done so for i965 but have requests for i915 support.
Change-Id: I87c3a8e3f206d75d58b63182ed94851749740762
Signed-off-by: Sean V Kelley <sean.v.kelley@linux.intel.com>
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.c | 1 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_texstate.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/i915/i915_vtbl.c | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index d3864465b26..f277f039ed8 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -107,6 +107,7 @@ intel_init_texture_formats(struct gl_context *ctx) ctx->TextureFormatSupported[MESA_FORMAT_ARGB4444] = true; ctx->TextureFormatSupported[MESA_FORMAT_ARGB1555] = true; ctx->TextureFormatSupported[MESA_FORMAT_RGB565] = true; + ctx->TextureFormatSupported[MESA_FORMAT_RGBX8888_REV] = true; ctx->TextureFormatSupported[MESA_FORMAT_L8] = true; ctx->TextureFormatSupported[MESA_FORMAT_A8] = true; ctx->TextureFormatSupported[MESA_FORMAT_I8] = true; diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index 9635025e6f9..c4a9e7e26ee 100644 --- a/src/mesa/drivers/dri/i915/i915_texstate.c +++ b/src/mesa/drivers/dri/i915/i915_texstate.c @@ -61,6 +61,8 @@ translate_texture_format(gl_format mesa_format, GLenum DepthMode) return MAPSURF_32BIT | MT_32BIT_ARGB8888; case MESA_FORMAT_XRGB8888: return MAPSURF_32BIT | MT_32BIT_XRGB8888; + case MESA_FORMAT_RGBX8888_REV: + return MAPSURF_32BIT | MT_32BIT_XBGR8888; case MESA_FORMAT_RGBA8888_REV: return MAPSURF_32BIT | MT_32BIT_ABGR8888; case MESA_FORMAT_YCBCR_REV: diff --git a/src/mesa/drivers/dri/i915/i915_vtbl.c b/src/mesa/drivers/dri/i915/i915_vtbl.c index 91fde5587f9..8677a03a3d1 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -551,6 +551,7 @@ static uint32_t i915_render_target_format_for_mesa_format[MESA_FORMAT_COUNT] = { [MESA_FORMAT_ARGB8888] = DV_PF_8888, [MESA_FORMAT_XRGB8888] = DV_PF_8888, + [MESA_FORMAT_RGBX8888_REV] = DV_PF_8888, [MESA_FORMAT_RGB565] = DV_PF_565 | DITHER_FULL_ALWAYS, [MESA_FORMAT_ARGB1555] = DV_PF_1555 | DITHER_FULL_ALWAYS, [MESA_FORMAT_ARGB4444] = DV_PF_4444 | DITHER_FULL_ALWAYS, |