From e5848fad7d425f98d2e463927b2d4cb681d831e2 Mon Sep 17 00:00:00 2001 From: Sean V Kelley Date: Mon, 10 Sep 2012 11:52:35 -0700 Subject: i915: Support Android RGBX8888 format for EGL generated images Enabled MESA_FORMAT_R8G8B8X8_UNORM (formerly 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 --- src/mesa/drivers/dri/i915/i915_context.c | 1 + src/mesa/drivers/dri/i915/i915_texstate.c | 2 ++ src/mesa/drivers/dri/i915/i915_vtbl.c | 1 + 3 files changed, 4 insertions(+) (limited to 'src/mesa') diff --git a/src/mesa/drivers/dri/i915/i915_context.c b/src/mesa/drivers/dri/i915/i915_context.c index 6c48823..e424f31 100644 --- a/src/mesa/drivers/dri/i915/i915_context.c +++ b/src/mesa/drivers/dri/i915/i915_context.c @@ -108,6 +108,7 @@ intel_init_texture_formats(struct gl_context *ctx) ctx->TextureFormatSupported[MESA_FORMAT_B4G4R4A4_UNORM] = true; ctx->TextureFormatSupported[MESA_FORMAT_B5G5R5A1_UNORM] = true; ctx->TextureFormatSupported[MESA_FORMAT_B5G6R5_UNORM] = true; + ctx->TextureFormatSupported[MESA_FORMAT_R8G8B8X8_UNORM] = true; ctx->TextureFormatSupported[MESA_FORMAT_L_UNORM8] = true; if (intel->gen == 3) ctx->TextureFormatSupported[MESA_FORMAT_A_UNORM8] = true; diff --git a/src/mesa/drivers/dri/i915/i915_texstate.c b/src/mesa/drivers/dri/i915/i915_texstate.c index f653f44..2839b98 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(mesa_format mesa_format, GLenum DepthMode) return MAPSURF_32BIT | MT_32BIT_ARGB8888; case MESA_FORMAT_B8G8R8X8_UNORM: return MAPSURF_32BIT | MT_32BIT_XRGB8888; + case MESA_FORMAT_R8G8B8X8_UNORM: + return MAPSURF_32BIT | MT_32BIT_XBGR8888; case MESA_FORMAT_R8G8B8A8_UNORM: 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 c41cd37..72218e5 100644 --- a/src/mesa/drivers/dri/i915/i915_vtbl.c +++ b/src/mesa/drivers/dri/i915/i915_vtbl.c @@ -550,6 +550,7 @@ static uint32_t i915_render_target_format_for_mesa_format[MESA_FORMAT_COUNT] = { [MESA_FORMAT_B8G8R8A8_UNORM] = DV_PF_8888, [MESA_FORMAT_B8G8R8X8_UNORM] = DV_PF_8888, + [MESA_FORMAT_R8G8B8X8_UNORM] = DV_PF_8888, [MESA_FORMAT_B5G6R5_UNORM] = DV_PF_565 | DITHER_FULL_ALWAYS, [MESA_FORMAT_B5G5R5A1_UNORM] = DV_PF_1555 | DITHER_FULL_ALWAYS, [MESA_FORMAT_B4G4R4A4_UNORM] = DV_PF_4444 | DITHER_FULL_ALWAYS, -- cgit v1.1