Mesa (master): intel: enable ATI_texture_env_combine3. Fixes #17707

[Xiang, Haihao]

On Mon, 2008-12-29 at 12:59 +0800, Xiang, Haihao wrote:
> On Mon, 2008-12-29 at 11:06 +0800, Eric Anholt wrote: 
> > On Sun, 2008-12-28 at 17:36 -0800, Haihao Xiang wrote:
> > > Module: Mesa
> > > Branch: master
> > > Commit: 0674a238547f9f4f9de9c6cf5d72015e5960aa9e
> > > URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=0674a238547f9f4f9de9c6cf5d72015e5960aa9e
> > > 
> > > Author: Xiang, Haihao <haihao.xiang at intel.com>
> > > Date:   Mon Dec 29 09:30:41 2008 +0800
> > > 
> > > intel: enable ATI_texture_env_combine3. Fixes #17707
> > > 
> > > ---
> > > 
> > >  src/mesa/drivers/dri/intel/intel_context.c |    1 +
> > >  1 files changed, 1 insertions(+), 0 deletions(-)
> > > 
> > > diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
> > > index 6ff98e9..83661df 100644
> > > --- a/src/mesa/drivers/dri/intel/intel_context.c
> > > +++ b/src/mesa/drivers/dri/intel/intel_context.c
> > > @@ -388,6 +388,7 @@ static const struct dri_extension card_extensions[] = {
> > >     { "GL_NV_vertex_program",              GL_NV_vertex_program_functions },
> > >     { "GL_NV_vertex_program1_1",           NULL },
> > >     { "GL_SGIS_generate_mipmap",           NULL },
> > > +   { "GL_ATI_texture_env_combine3",       NULL },
> > >     { NULL, NULL }
> > >  };
> > 
> > Is this really supported on all of our chipsets (i830, in particular)?
> I just tested it on 945GM and GM45. (I haven't i830 machine).
> 
> According to spec, ATI_texture_env_combine3 only adds three new
> operations to the texture combiner operations:
> MODULATE_ADD_ATI               Arg0 * Arg2 + Arg1 
> MODULATE_SIGNED_ADD_ATI        Arg0 * Arg2 + Arg1 - 0.5
> MODULATE_SUBTRACT_ATI          Arg0 * Arg2 - Arg1.
> 
> ARB_texture_env_combine has been supported in i915/i965 driver, so I think ATI_texture_env_combine3 can be also supported 
> on our chipsets.
> 
Seems i830 only supports MODULATE_ADD mode, so I will disable
ATI_texture_env_combine3 for i830. 

> 
> > Also, please sort it below GL_APPLE_client_storage.
> I will sort it.
> 
> 
>