Mesa (master): gallivm: added texture border_color field

[Brian Paul]

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

Author: Brian Paul <brianp at vmware.com>
Date:   Thu Mar  4 15:52:01 2010 -0700

gallivm: added texture border_color field

---

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

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.c b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
index a133b56..55ac2e9 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.c
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.c
@@ -44,6 +44,11 @@
 #include "lp_bld_sample.h"
 
 
+/**
+ * Initialize lp_sampler_static_state object with the gallium sampler
+ * and texture state.
+ * The former is considered to be static and the later dynamic.
+ */
 void
 lp_sampler_static_state(struct lp_sampler_static_state *state,
                         const struct pipe_texture *texture,
@@ -70,6 +75,10 @@ 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->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;
    }
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index 39edcf1..a791d88 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 border_color[4];
 };