Merge Mesa 18.3.2

1 files changed, 15 insertions, 18 deletions

diff --git a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_util.h b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_util.h
index 534b5f78e..686b90f46 100644
--- a/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_util.h
+++ b/lib/mesa/src/gallium/auxiliary/tgsi/tgsi_util.h
@@ -39,13 +39,11 @@ struct tgsi_full_src_register;
 struct tgsi_full_instruction;
 
 void *
-tgsi_align_128bit(
-   void *unaligned );
+tgsi_align_128bit(void *unaligned);
 
 unsigned
-tgsi_util_get_src_register_swizzle(
-   const struct tgsi_src_register *reg,
-   unsigned component );
+tgsi_util_get_src_register_swizzle(const struct tgsi_src_register *reg,
+                                   unsigned component);
 
 
 unsigned
@@ -54,10 +52,10 @@ tgsi_util_get_full_src_register_swizzle(
    unsigned component );
 
 void
-tgsi_util_set_src_register_swizzle(
-   struct tgsi_src_register *reg,
-   unsigned swizzle,
-   unsigned component );
+tgsi_util_set_src_register_swizzle(struct tgsi_src_register *reg,
+                                   unsigned swizzle,
+                                   unsigned component);
+
 
 #define TGSI_UTIL_SIGN_CLEAR    0   /* Force positive */
 #define TGSI_UTIL_SIGN_SET      1   /* Force negative */
@@ -67,12 +65,11 @@ tgsi_util_set_src_register_swizzle(
 unsigned
 tgsi_util_get_full_src_register_sign_mode(
    const struct tgsi_full_src_register *reg,
-   unsigned component );
+   unsigned component);
 
 void
-tgsi_util_set_full_src_register_sign_mode(
-   struct tgsi_full_src_register *reg,
-   unsigned sign_mode );
+tgsi_util_set_full_src_register_sign_mode(struct tgsi_full_src_register *reg,
+                                          unsigned sign_mode);
 
 unsigned
 tgsi_util_get_inst_usage_mask(const struct tgsi_full_instruction *inst,
@@ -82,24 +79,24 @@ struct tgsi_src_register
 tgsi_util_get_src_from_ind(const struct tgsi_ind_register *reg);
 
 int
-tgsi_util_get_texture_coord_dim(unsigned tgsi_tex);
+tgsi_util_get_texture_coord_dim(enum tgsi_texture_type tgsi_tex);
 
 int
-tgsi_util_get_shadow_ref_src_index(unsigned tgsi_tex);
+tgsi_util_get_shadow_ref_src_index(enum tgsi_texture_type tgsi_tex);
 
 boolean
-tgsi_is_shadow_target(unsigned target);
+tgsi_is_shadow_target(enum tgsi_texture_type target);
 
 
 static inline boolean
-tgsi_is_msaa_target(unsigned target)
+tgsi_is_msaa_target(enum tgsi_texture_type target)
 {
    return (target == TGSI_TEXTURE_2D_MSAA ||
            target == TGSI_TEXTURE_2D_ARRAY_MSAA);
 }
 
 static inline bool
-tgsi_is_array_sampler(unsigned target)
+tgsi_is_array_sampler(enum tgsi_texture_type target)
 {
    return target == TGSI_TEXTURE_1D_ARRAY ||
           target == TGSI_TEXTURE_SHADOW1D_ARRAY ||