Merge Mesa 21.1.5

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/mesa/src/gallium/drivers/freedreno/freedreno_texture.h b/lib/mesa/src/gallium/drivers/freedreno/freedreno_texture.h
index 94fb2e810..7cb523c90 100644
--- a/lib/mesa/src/gallium/drivers/freedreno/freedreno_texture.h
+++ b/lib/mesa/src/gallium/drivers/freedreno/freedreno_texture.h
@@ -30,13 +30,13 @@
 #include "pipe/p_context.h"
 
 void fd_sampler_states_bind(struct pipe_context *pctx,
-		enum pipe_shader_type shader, unsigned start,
-		unsigned nr, void **hwcso);
+                            enum pipe_shader_type shader, unsigned start,
+                            unsigned nr, void **hwcso);
 
 void fd_set_sampler_views(struct pipe_context *pctx,
-						  enum pipe_shader_type shader,
-						  unsigned start, unsigned nr,
-						  struct pipe_sampler_view **views);
+                          enum pipe_shader_type shader, unsigned start,
+                          unsigned nr, unsigned unbind_num_trailing_slots,
+                          struct pipe_sampler_view **views);
 
 void fd_texture_init(struct pipe_context *pctx);
 
@@ -69,6 +69,6 @@ struct fd_texture_stateobj;
  */
 #define BORDERCOLOR_SIZE 0x40
 void fd_setup_border_colors(struct fd_texture_stateobj *tex, void *ptr,
-		unsigned offset);
+                            unsigned offset);
 
 #endif /* FREEDRENO_TEXTURE_H_ */