diff options
Diffstat (limited to 'src/mesa/drivers/dri/r200/r200_tex.c')
| -rw-r--r-- | src/mesa/drivers/dri/r200/r200_tex.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/mesa/drivers/dri/r200/r200_tex.c b/src/mesa/drivers/dri/r200/r200_tex.c index f72cad3665..c524a1f101 100644 --- a/src/mesa/drivers/dri/r200/r200_tex.c +++ b/src/mesa/drivers/dri/r200/r200_tex.c @@ -471,13 +471,14 @@ static struct gl_texture_object *r200NewTextureObject(struct gl_context * ctx, _mesa_lookup_enum_by_nr(target), t); _mesa_initialize_texture_object(&t->base, name, target); - t->base.Sampler.MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy; + t->base.Sampler = _mesa_mutable_sampler_object(t->base.Sampler); + t->base.Sampler->MaxAnisotropy = rmesa->radeon.initialMaxAnisotropy; /* Initialize hardware state */ - r200SetTexWrap( t, t->base.Sampler.WrapS, t->base.Sampler.WrapT, t->base.Sampler.WrapR ); - r200SetTexMaxAnisotropy( t, t->base.Sampler.MaxAnisotropy ); - r200SetTexFilter(t, t->base.Sampler.MinFilter, t->base.Sampler.MagFilter); - r200SetTexBorderColor(t, t->base.Sampler.BorderColor.f); + r200SetTexWrap( t, t->base.Sampler->WrapS, t->base.Sampler->WrapT, t->base.Sampler->WrapR ); + r200SetTexMaxAnisotropy( t, t->base.Sampler->MaxAnisotropy ); + r200SetTexFilter(t, t->base.Sampler->MinFilter, t->base.Sampler->MagFilter); + r200SetTexBorderColor(t, t->base.Sampler->BorderColor.f); return &t->base; } @@ -507,8 +508,8 @@ void r200InitTextureFuncs( radeonContextPtr radeon, struct dd_function_table *fu // functions->BindTexture = r200BindTexture; functions->DeleteTexture = r200DeleteTexture; + functions->TexParameter = r200TexParameter; functions->TexEnv = r200TexEnv; - functions->TexParameter = r200TexParameter; functions->TexGen = r200TexGen; - functions->NewSamplerObject = r200NewSamplerObject; + functions->NewSamplerObject = r200NewSamplerObject; } |