gallium: make max_anisotropy a unsigned bitfield member

saves us a dword in sampler state, hw can't do non-integer aniso degree anyway.
To allow aniso 1x (which seems of dubious value but some hardware (radeons)
have such a mode, and even d3d allows specifiying it) redefine anisotropic
filtering as disabled only if max_anistropy is 0.

diff --git a/src/gallium/docs/source/cso/sampler.rst b/src/gallium/docs/source/cso/sampler.rst
index 044ffffcb4fcba4ded9e4c3210febdf4cbfdc32c..77979fc44d1a773c815e04376cd310690a321c4b 100644 (file)
--- a/src/gallium/docs/source/cso/sampler.rst
+++ b/src/gallium/docs/source/cso/sampler.rst
@@ -45,4 +45,6 @@ border_color
     RGBA color used for out-of-bounds coordinates.
 max_anisotropy
     Maximum filtering to apply anisotropically to textures. Setting this to
-    1.0 effectively disables anisotropic filtering.
+    0 disables anisotropic filtering. Any other setting enables anisotropic
+    filtering, however it's not unexpected some drivers only will change their
+    filtering with a setting of 2 and higher.

diff --git a/src/gallium/drivers/i915/i915_state.c b/src/gallium/drivers/i915/i915_state.c
index 14a9314dab33e2147907343ffae5c44e8c99f1ef..62169918e2b715bedf8decb306ecde8ffaba4c20 100644 (file)
--- a/src/gallium/drivers/i915/i915_state.c
+++ b/src/gallium/drivers/i915/i915_state.c
@@ -228,10 +228,10 @@ i915_create_sampler_state(struct pipe_context *pipe,
    minFilt = translate_img_filter( sampler->min_img_filter );
    magFilt = translate_img_filter( sampler->mag_img_filter );
    
-   if (sampler->max_anisotropy > 1.0)
+   if (sampler->max_anisotropy > 1)
       minFilt = magFilt = FILTER_ANISOTROPIC;
 
-   if (sampler->max_anisotropy > 2.0) {
+   if (sampler->max_anisotropy > 2) {
       cso->state[0] |= SS2_MAX_ANISO_4;
    }
 

diff --git a/src/gallium/drivers/i965/brw_pipe_sampler.c b/src/gallium/drivers/i965/brw_pipe_sampler.c
index 6aab561004366d3c496769c88ba2845ac76415b5..c7c0e2ae95ea3f916ee551d703ae37d560c5ab6f 100644 (file)
--- a/src/gallium/drivers/i965/brw_pipe_sampler.c
+++ b/src/gallium/drivers/i965/brw_pipe_sampler.c
@@ -114,14 +114,12 @@ brw_create_sampler_state( struct pipe_context *pipe,
 
    /* XXX: anisotropy logic slightly changed: 
     */
-   if (template->max_anisotropy > 1.0) {
+   if (template->max_anisotropy > 1) {
       sampler->ss0.min_filter = BRW_MAPFILTER_ANISOTROPIC; 
       sampler->ss0.mag_filter = BRW_MAPFILTER_ANISOTROPIC;
 
-      if (template->max_anisotropy > 2.0) {
-        sampler->ss3.max_aniso = MIN2((template->max_anisotropy - 2) / 2,
-                                      BRW_ANISORATIO_16);
-      }
+      sampler->ss3.max_aniso = MIN2((template->max_anisotropy - 2) / 2,
+                                    BRW_ANISORATIO_16);
    }
 
    sampler->ss1.r_wrap_mode = translate_wrap_mode(template->wrap_r);

diff --git a/src/gallium/drivers/nv30/nv30_state.c b/src/gallium/drivers/nv30/nv30_state.c
index 8fc6856ee5e596474d9efd667512faf9b204eb89..d911c80707404656a07a15090912432f03159a13 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.c
+++ b/src/gallium/drivers/nv30/nv30_state.c
@@ -139,13 +139,13 @@ nv30_sampler_state_create(struct pipe_context *pipe,
 
        ps->en = 0;
 
-       if (cso->max_anisotropy >= 8.0) {
+       if (cso->max_anisotropy >= 8) {
                ps->en |= NV34TCL_TX_ENABLE_ANISO_8X;
        } else
-       if (cso->max_anisotropy >= 4.0) {
+       if (cso->max_anisotropy >= 4) {
                ps->en |= NV34TCL_TX_ENABLE_ANISO_4X;
        } else
-       if (cso->max_anisotropy >= 2.0) {
+       if (cso->max_anisotropy >= 2) {
                ps->en |= NV34TCL_TX_ENABLE_ANISO_2X;
        }
 

diff --git a/src/gallium/drivers/nv40/nv40_state.c b/src/gallium/drivers/nv40/nv40_state.c
index d068be6243aa8e123ba19ebd5011eb7b45bcb8b4..2073bf0735374f57d04c7bcbbe179907998ba5ed 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_state.c
+++ b/src/gallium/drivers/nv40/nv40_state.c
@@ -132,26 +132,26 @@ nv40_sampler_state_create(struct pipe_context *pipe,
                    (wrap_mode(cso->wrap_r) << NV40TCL_TEX_WRAP_R_SHIFT));
 
        ps->en = 0;
-       if (cso->max_anisotropy >= 2.0) {
+       if (cso->max_anisotropy >= 2) {
                /* no idea, binary driver sets it, works without it.. meh.. */
                ps->wrap |= (1 << 5);
 
-               if (cso->max_anisotropy >= 16.0) {
+               if (cso->max_anisotropy >= 16) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_16X;
                } else
-               if (cso->max_anisotropy >= 12.0) {
+               if (cso->max_anisotropy >= 12) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_12X;
                } else
-               if (cso->max_anisotropy >= 10.0) {
+               if (cso->max_anisotropy >= 10) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_10X;
                } else
-               if (cso->max_anisotropy >= 8.0) {
+               if (cso->max_anisotropy >= 8) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_8X;
                } else
-               if (cso->max_anisotropy >= 6.0) {
+               if (cso->max_anisotropy >= 6) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_6X;
                } else
-               if (cso->max_anisotropy >= 4.0) {
+               if (cso->max_anisotropy >= 4) {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_4X;
                } else {
                        ps->en |= NV40TCL_TEX_ENABLE_ANISO_2X;

diff --git a/src/gallium/drivers/nv50/nv50_state.c b/src/gallium/drivers/nv50/nv50_state.c
index 05d519a2f95b41a4629691f71f2282b4338ce656..7d304907b652240da70bc57878c56511e7deef34 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_state.c
+++ b/src/gallium/drivers/nv50/nv50_state.c
@@ -202,18 +202,18 @@ nv50_sampler_state_create(struct pipe_context *pipe,
                break;
        }
 
-       if (cso->max_anisotropy >= 16.0)
+       if (cso->max_anisotropy >= 16)
                tsc[0] |= (7 << 20);
        else
-       if (cso->max_anisotropy >= 12.0)
+       if (cso->max_anisotropy >= 12)
                tsc[0] |= (6 << 20);
        else {
-               tsc[0] |= (int)(cso->max_anisotropy * 0.5f) << 20;
+               tsc[0] |= (cso->max_anisotropy >> 1) << 20;
 
-               if (cso->max_anisotropy >= 4.0)
+               if (cso->max_anisotropy >= 4)
                        tsc[1] |= NV50TSC_1_1_UNKN_ANISO_35;
                else
-               if (cso->max_anisotropy >= 2.0)
+               if (cso->max_anisotropy >= 2)
                        tsc[1] |= NV50TSC_1_1_UNKN_ANISO_15;
        }
 

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index a6a4f99d730f6f527ff0a8070a3fa979b4e09708..8d68aa230bf4474fda69ef880100a844754a9e2d 100644 (file)
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -777,7 +777,7 @@ static void*
     sampler->filter0 |= r300_translate_tex_filters(state->min_img_filter,
                                                    state->mag_img_filter,
                                                    state->min_mip_filter,
-                                                   state->max_anisotropy > 1.0);
+                                                   state->max_anisotropy > 0);
 
     /* Unfortunately, r300-r500 don't support floating-point mipmap lods. */
     /* We must pass these to the emit function to clamp them properly. */

diff --git a/src/gallium/drivers/r300/r300_state_inlines.h b/src/gallium/drivers/r300/r300_state_inlines.h
index 5df6815221f600dbfeddff0dba976db653b41f79..779ba2c7be4ab0cc93dc058f2c4d7b5874f112cf 100644 (file)
--- a/src/gallium/drivers/r300/r300_state_inlines.h
+++ b/src/gallium/drivers/r300/r300_state_inlines.h
@@ -312,15 +312,15 @@ static INLINE uint32_t r300_translate_tex_filters(int min, int mag, int mip,
     return retval;
 }
 
-static INLINE uint32_t r300_anisotropy(float max_aniso)
+static INLINE uint32_t r300_anisotropy(unsigned max_aniso)
 {
-    if (max_aniso >= 16.0f) {
+    if (max_aniso >= 16) {
         return R300_TX_MAX_ANISO_16_TO_1;
-    } else if (max_aniso >= 8.0f) {
+    } else if (max_aniso >= 8) {
         return R300_TX_MAX_ANISO_8_TO_1;
-    } else if (max_aniso >= 4.0f) {
+    } else if (max_aniso >= 4) {
         return R300_TX_MAX_ANISO_4_TO_1;
-    } else if (max_aniso >= 2.0f) {
+    } else if (max_aniso >= 2) {
         return R300_TX_MAX_ANISO_2_TO_1;
     } else {
         return R300_TX_MAX_ANISO_1_TO_1;

diff --git a/src/gallium/drivers/svga/svga_pipe_sampler.c b/src/gallium/drivers/svga/svga_pipe_sampler.c
index b70081343d10fa2e722aff7e6a7106e0adfbbcc8..2a9adfbb067b6ad1cfb0ffce5c343e7f64c4a0c6 100644 (file)
--- a/src/gallium/drivers/svga/svga_pipe_sampler.c
+++ b/src/gallium/drivers/svga/svga_pipe_sampler.c
@@ -102,8 +102,8 @@ svga_create_sampler_state(struct pipe_context *pipe,
    cso->mipfilter = translate_mip_filter(sampler->min_mip_filter);
    cso->magfilter = translate_img_filter( sampler->mag_img_filter );
    cso->minfilter = translate_img_filter( sampler->min_img_filter );
-   cso->aniso_level = MAX2( (unsigned) sampler->max_anisotropy, 1 );
-   if(cso->aniso_level != 1)
+   cso->aniso_level = MAX2( sampler->max_anisotropy, 1 );
+   if(sampler->max_anisotropy)
       cso->magfilter = cso->minfilter = SVGA3D_TEX_FILTER_ANISOTROPIC;
    cso->lod_bias = sampler->lod_bias;
    cso->addressu = translate_wrap_mode(sampler->wrap_s);

diff --git a/src/gallium/drivers/trace/tr_dump_state.c b/src/gallium/drivers/trace/tr_dump_state.c
index 62fa09accf3cbcade2df55758df2561b3dcc835a..a4c7255126960f0a83400aea211ef6937a270a93 100644 (file)
--- a/src/gallium/drivers/trace/tr_dump_state.c
+++ b/src/gallium/drivers/trace/tr_dump_state.c
@@ -435,11 +435,11 @@ void trace_dump_sampler_state(const struct pipe_sampler_state *state)
    trace_dump_member(uint, state, compare_mode);
    trace_dump_member(uint, state, compare_func);
    trace_dump_member(bool, state, normalized_coords);
+   trace_dump_member(uint, state, max_anisotropy);
    trace_dump_member(float, state, lod_bias);
    trace_dump_member(float, state, min_lod);
    trace_dump_member(float, state, max_lod);
    trace_dump_member_array(float, state, border_color);
-   trace_dump_member(float, state, max_anisotropy);
 
    trace_dump_struct_end();
 }

diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h
index 23748acbdc293031c32b98213caa72b5c11f3af0..5ac5c878135db10ae652438c1c5576cc6e626251 100644 (file)
--- a/src/gallium/include/pipe/p_state.h
+++ b/src/gallium/include/pipe/p_state.h
@@ -281,10 +281,10 @@ struct pipe_sampler_state
    unsigned compare_mode:1;      /**< PIPE_TEX_COMPARE_x */
    unsigned compare_func:3;      /**< PIPE_FUNC_x */
    unsigned normalized_coords:1; /**< Are coords normalized to [0,1]? */
+   unsigned max_anisotropy:6;
    float lod_bias;               /**< LOD/lambda bias */
    float min_lod, max_lod;       /**< LOD clamp range, after bias */
    float border_color[4];
-   float max_anisotropy;
 };
 
 

diff --git a/src/mesa/state_tracker/st_atom_sampler.c b/src/mesa/state_tracker/st_atom_sampler.c
index 9d63f1c6ab6583b251e8d4d6514b0311477f3421..a8262a5e1aa3c4639853b056cfc4256fe4d2a592 100644 (file)
--- a/src/mesa/state_tracker/st_atom_sampler.c
+++ b/src/mesa/state_tracker/st_atom_sampler.c
@@ -211,7 +211,7 @@ update_samplers(struct st_context *st)
                             teximg ? teximg->_BaseFormat : GL_RGBA,
                             sampler->border_color);
 
-        sampler->max_anisotropy = texobj->MaxAnisotropy;
+        sampler->max_anisotropy = (texobj->MaxAnisotropy == 1.0 ? 0 : (GLuint)texobj->MaxAnisotropy);
 
          /* only care about ARB_shadow, not SGI shadow */
          if (texobj->CompareMode == GL_COMPARE_R_TO_TEXTURE) {