Mesa (master): gallivm: added field for sampler lod

Brian Paul brianp at kemper.freedesktop.org
Fri Mar 5 15:52:32 PST 2010


Module: Mesa
Branch: master
Commit: 36a0c4219deaa1509ae9746abb845f9502ca9f1b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=36a0c4219deaa1509ae9746abb845f9502ca9f1b

Author: Brian Paul <brianp at vmware.com>
Date:   Fri Mar  5 16:07:26 2010 -0700

gallivm: added field for sampler lod

---

 src/gallium/auxiliary/gallivm/lp_bld_sample.c |    9 +++++----
 src/gallium/auxiliary/gallivm/lp_bld_sample.h |    1 +
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
index 55ac2e9..6a026e4 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
@@ -75,14 +75,15 @@ lp_sampler_static_state(struct lp_sampler_static_state *state,
    state->min_mip_filter    = sampler->min_mip_filter;
    state->mag_img_filter    = sampler->mag_img_filter;
    state->compare_mode      = sampler->compare_mode;
+   state->compare_func      = sampler->compare_func;
+   state->normalized_coords = sampler->normalized_coords;
+   state->lod_bias          = sampler->lod_bias;
+   state->min_lod           = sampler->min_lod;
+   state->max_lod           = sampler->max_lod;
    state->border_color[0]   = sampler->border_color[0];
    state->border_color[1]   = sampler->border_color[1];
    state->border_color[2]   = sampler->border_color[2];
    state->border_color[3]   = sampler->border_color[3];
-   if(sampler->compare_mode != PIPE_TEX_COMPARE_NONE) {
-      state->compare_func      = sampler->compare_func;
-   }
-   state->normalized_coords = sampler->normalized_coords;
 }
 
 
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index a791d88..2120775 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
@@ -70,6 +70,7 @@ struct lp_sampler_static_state
    unsigned compare_mode:1;
    unsigned compare_func:3;
    unsigned normalized_coords:1;
+   float lod_bias, min_lod, max_lod;
    float border_color[4];
 };
 



More information about the mesa-commit mailing list