import Mesa 11.0.6

1 files changed, 11 insertions, 23 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
index eb632b700..2ca9c6194 100644
--- a/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
+++ b/lib/mesa/src/gallium/auxiliary/gallivm/lp_bld_tgsi.h
@@ -48,11 +48,7 @@
 #include "tgsi/tgsi_scan.h"
 #include "tgsi/tgsi_info.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define LP_CHAN_ALL ~0u
+#define LP_CHAN_ALL ~0
 
 #define LP_MAX_INSTRUCTIONS 256
 
@@ -194,7 +190,14 @@ struct lp_build_sampler_soa
    void
    (*emit_size_query)( const struct lp_build_sampler_soa *sampler,
                        struct gallivm_state *gallivm,
-                       const struct lp_sampler_size_query_params *params);
+                       struct lp_type type,
+                       unsigned unit,
+                       unsigned target,
+                       LLVMValueRef context_ptr,
+                       boolean need_nr_mips,
+                       enum lp_sampler_lod_property,
+                       LLVMValueRef explicit_lod, /* optional */
+                       LLVMValueRef *sizes_out);
 };
 
 
@@ -227,7 +230,6 @@ lp_build_tgsi_soa(struct gallivm_state *gallivm,
                   const LLVMValueRef (*inputs)[4],
                   LLVMValueRef (*outputs)[4],
                   LLVMValueRef context_ptr,
-                  LLVMValueRef thread_data_ptr,
                   struct lp_build_sampler_soa *sampler,
                   const struct tgsi_shader_info *info,
                   const struct lp_build_tgsi_gs_iface *gs_iface);
@@ -337,10 +339,6 @@ struct lp_build_tgsi_context
    struct lp_build_context int_bld;
 
    struct lp_build_context dbl_bld;
-
-   struct lp_build_context uint64_bld;
-   struct lp_build_context int64_bld;
-
    /** This array stores functions that are used to transform TGSI opcodes to
      * LLVM instructions.
      */
@@ -449,7 +447,6 @@ struct lp_build_tgsi_soa_context
    const LLVMValueRef (*inputs)[TGSI_NUM_CHANNELS];
    LLVMValueRef (*outputs)[TGSI_NUM_CHANNELS];
    LLVMValueRef context_ptr;
-   LLVMValueRef thread_data_ptr;
 
    const struct lp_build_sampler_soa *sampler;
 
@@ -458,6 +455,7 @@ struct lp_build_tgsi_soa_context
    LLVMValueRef immediates[LP_MAX_INLINED_IMMEDIATES][TGSI_NUM_CHANNELS];
    LLVMValueRef temps[LP_MAX_INLINED_TEMPS][TGSI_NUM_CHANNELS];
    LLVMValueRef addr[LP_MAX_TGSI_ADDRS][TGSI_NUM_CHANNELS];
+   LLVMValueRef preds[LP_MAX_TGSI_PREDS][TGSI_NUM_CHANNELS];
 
    /* We allocate/use this array of temps if (1 << TGSI_FILE_TEMPORARY) is
     * set in the indirect_files field.
@@ -551,6 +549,7 @@ struct lp_build_tgsi_aos_context
    LLVMValueRef immediates[LP_MAX_INLINED_IMMEDIATES];
    LLVMValueRef temps[LP_MAX_INLINED_TEMPS];
    LLVMValueRef addr[LP_MAX_TGSI_ADDRS];
+   LLVMValueRef preds[LP_MAX_TGSI_PREDS];
 
    /* We allocate/use this array of temps if (1 << TGSI_FILE_TEMPORARY) is
     * set in the indirect_files field.
@@ -643,13 +642,6 @@ lp_build_tgsi_inst_llvm(
    const struct tgsi_full_instruction *inst);
 
 LLVMValueRef
-lp_build_emit_fetch_src(
-   struct lp_build_tgsi_context *bld_base,
-   const struct tgsi_full_src_register *reg,
-   enum tgsi_opcode_type stype,
-   const unsigned chan_index);
-
-LLVMValueRef
 lp_build_emit_fetch(
    struct lp_build_tgsi_context *bld_base,
    const struct tgsi_full_instruction *inst,
@@ -669,8 +661,4 @@ lp_build_tgsi_llvm(
    struct lp_build_tgsi_context * bld_base,
    const struct tgsi_token *tokens);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* LP_BLD_TGSI_H */