← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nvfx/nv30_fragtex.c

  • Committer: Package Import Robot
  • Author(s): Robert Hooker
  • Date: 2012-02-02 12:05:48 UTC
  • mfrom: (1.7.1) (3.3.27 sid)
  • Revision ID: package-import@ubuntu.com-20120202120548-nvkma85jq0h4coix
Tags: 8.0~rc2-0ubuntu4
Drop drisearchdir handling, it is no longer needed with multiarch
and dri-alternates being removed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/nvfx/nv30_fragtex.c
9
9
                          struct nvfx_sampler_state *ps,
10
10
                          const struct pipe_sampler_state *cso)
11
11
{
12
 
        float limit;
13
 
 
14
12
        if (cso->max_anisotropy >= 2)
15
13
        {
16
14
                if (cso->max_anisotropy >= 8)
21
19
                        ps->en |= NV30_3D_TEX_ENABLE_ANISO_2X;
22
20
        }
23
21
 
24
 
        limit = CLAMP(cso->lod_bias, -16.0, 15.0 + (255.0 / 256.0));
25
22
        ps->filt |= (int)(cso->lod_bias * 256.0) & 0x1fff;
26
23
 
27
24
        ps->max_lod = (int)CLAMP(cso->max_lod, 0.0, 15.0);
58
55
        if(pt->height0 <= 1 || util_format_is_compressed(sv->base.format))
59
56
                sv->u.nv30.rect = -1;
60
57
        else
61
 
                sv->u.nv30.rect = !!(pt->flags & NVFX_RESOURCE_FLAG_LINEAR);
 
58
                sv->u.nv30.rect = !!(pt->flags & NOUVEAU_RESOURCE_FLAG_LINEAR);
62
59
 
63
60
        sv->lod_offset = sv->base.u.tex.first_level - level;
64
61
        sv->max_lod_limit = sv->base.u.tex.last_level - level;