Merge branch '7.8'

[mesa.git] / src / gallium / auxiliary / gallivm / lp_bld_sample.h

diff --git a/src/gallium/auxiliary/gallivm/lp_bld_sample.h b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
index 8c1af95c506bfa879c074145d6705230b981431c..8ceb20473d57099988f9c1c86b94fba4dbb8f1c8 100644 (file)
--- a/src/gallium/auxiliary/gallivm/lp_bld_sample.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_sample.h
@@ -54,8 +54,14 @@ struct lp_build_context;
  */
 struct lp_sampler_static_state
 {
-   /* pipe_texture's state */
+   /* pipe_sampler_view's state */
    enum pipe_format format;
+   unsigned swizzle_r:3;
+   unsigned swizzle_g:3;
+   unsigned swizzle_b:3;
+   unsigned swizzle_a:3;
+
+   /* pipe_texture's state */
    unsigned target:3;
    unsigned pot_width:1;
    unsigned pot_height:1;
@@ -118,6 +124,11 @@ struct lp_sampler_dynamic_state
                   LLVMBuilderRef builder,
                   unsigned unit);
 
+   LLVMValueRef
+   (*img_stride)( struct lp_sampler_dynamic_state *state,
+                  LLVMBuilderRef builder,
+                  unsigned unit);
+
    LLVMValueRef
    (*data_ptr)( struct lp_sampler_dynamic_state *state,
                 LLVMBuilderRef builder,