[Mesa-dev] [PATCH 1/2] intel: Enable S3TC extensions always

[Ian Romanick]

On 10/18/2012 02:28 PM, Jordan Justen wrote:
> RE: Series
>
> Candidate for stable?

Patch 1/2 is probably only a candidate for 9.0 branch.  It has a weak 
dependency on some other work that's only on 9.0 (see 42723d8).

Patch 2/2 could be a candidate for both 8.0 and 9.0.  I suspect that 
most people build our driver with floating-point textures enabled 
anyway, so it's no real change.

> Reviewed-by: Jordan Justen <jordan.l.justen at intel.com>
>
> On Thu, Oct 18, 2012 at 2:02 PM, Ian Romanick <idr at freedesktop.org> wrote:
>> From: Ian Romanick <ian.d.romanick at intel.com>
>>
>> Always enable the use of pre- compressed texture data, and always advertise
>> the ability to do on-line compression.  The ability to perform on-line
>> compression still requires the presence of libtxc_dxtn, so sometimes the
>> driver incorrectly over-advertises functionality.  This should not impact many
>> (if any) real applications.
>>
>> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>> ---
>>   src/mesa/drivers/dri/intel/intel_extensions.c | 11 +++--------
>>   1 file changed, 3 insertions(+), 8 deletions(-)
>>
>> diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c
>> index ec99c3e..40fdd23 100755
>> --- a/src/mesa/drivers/dri/intel/intel_extensions.c
>> +++ b/src/mesa/drivers/dri/intel/intel_extensions.c
>> @@ -179,14 +179,9 @@ intelInitExtensions(struct gl_context *ctx)
>>           ctx->Extensions.ARB_occlusion_query = true;
>>      }
>>
>> -   if (intel->ctx.Mesa_DXTn) {
>> -      ctx->Extensions.ANGLE_texture_compression_dxt = true;
>> -      ctx->Extensions.EXT_texture_compression_s3tc = true;
>> -      ctx->Extensions.S3_s3tc = true;
>> -   }
>> -   else if (driQueryOptionb(&intel->optionCache, "force_s3tc_enable")) {
>> -      ctx->Extensions.EXT_texture_compression_s3tc = true;
>> -   }
>> +   ctx->Extensions.ANGLE_texture_compression_dxt = true;
>> +   ctx->Extensions.EXT_texture_compression_s3tc = true;
>> +   ctx->Extensions.S3_s3tc = true;
>>
>>      if (intel->gen >= 4) {
>>         ctx->Extensions.NV_primitive_restart = true;
>> --
>> 1.7.11.4
>>
>> _______________________________________________
>> mesa-dev mailing list
>> mesa-dev at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/mesa-dev