From 2fd8c4e3edf989c6f7dd1261a67b01f06979feab Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 20 Sep 2011 15:14:53 -0700 Subject: [PATCH] i965: Add support for GL_EXT_texture_shared_exponent. Only one failure in piglit on gen6, which is texwrap with bordercolor (as usual). Reviewed-by: Kenneth Graunke --- docs/relnotes-7.12.html | 1 + src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 1 + src/mesa/drivers/dri/intel/intel_context.c | 3 +++ src/mesa/drivers/dri/intel/intel_extensions.c | 1 + 4 files changed, 6 insertions(+) diff --git a/docs/relnotes-7.12.html b/docs/relnotes-7.12.html index 3d3df594e13..f469f104533 100644 --- a/docs/relnotes-7.12.html +++ b/docs/relnotes-7.12.html @@ -36,6 +36,7 @@ tbd

New features

diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 1df2202b939..20e726581f6 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -121,6 +121,7 @@ brw_format_for_mesa_format(gl_format mesa_format) [MESA_FORMAT_SIGNED_RED_RGTC1] = BRW_SURFACEFORMAT_BC4_SNORM, [MESA_FORMAT_RG_RGTC2] = BRW_SURFACEFORMAT_BC5_UNORM, [MESA_FORMAT_SIGNED_RG_RGTC2] = BRW_SURFACEFORMAT_BC5_SNORM, + [MESA_FORMAT_RGB9_E5_FLOAT] = BRW_SURFACEFORMAT_R9G9B9E5_SHAREDEXP, }; assert(mesa_format < MESA_FORMAT_COUNT); return table[mesa_format]; diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c index 2589ee54a2e..ada503fff41 100644 --- a/src/mesa/drivers/dri/intel/intel_context.c +++ b/src/mesa/drivers/dri/intel/intel_context.c @@ -730,6 +730,9 @@ intelInitContext(struct intel_context *intel, ctx->TextureFormatSupported[MESA_FORMAT_LUMINANCE_FLOAT32] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_ALPHA_FLOAT32] = GL_TRUE; ctx->TextureFormatSupported[MESA_FORMAT_LUMINANCE_ALPHA_FLOAT32] = GL_TRUE; + + /* GL_EXT_texture_shared_exponent */ + ctx->TextureFormatSupported[MESA_FORMAT_RGB9_E5_FLOAT] = GL_TRUE; #endif #endif /* !I915 */ diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c index 5c3442a2b7b..43f0d83f14d 100644 --- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -132,6 +132,7 @@ intelInitExtensions(struct gl_context *ctx) ctx->Extensions.ARB_shader_texture_lod = true; #ifdef TEXTURE_FLOAT_ENABLED ctx->Extensions.ARB_texture_float = true; + ctx->Extensions.EXT_texture_shared_exponent = true; #endif ctx->Extensions.ARB_texture_compression_rgtc = true; ctx->Extensions.ARB_texture_rg = true;