Mesa (master): gallium: Fix PIPE_BIND_SAMPLER_REDUCTION_MINMAX definition to be unique

[GitLab Mirror]

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

Author: Adam Jackson <ajax at redhat.com>
Date:   Wed Apr 21 18:26:23 2021 -0400

gallium: Fix PIPE_BIND_SAMPLER_REDUCTION_MINMAX definition to be unique

This accidentally collided with PIPE_BIND_SCANOUT.

Fixes: 59ad872458c gallium: add PIPE_BIND_SAMPLER_REDUCTION_MINMAX
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10397>

---

 src/gallium/include/pipe/p_defines.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h
index 08bb63ebbc5..b42f26b26d4 100644
--- a/src/gallium/include/pipe/p_defines.h
+++ b/src/gallium/include/pipe/p_defines.h
@@ -490,7 +490,6 @@ enum pipe_flush_flags
 #define PIPE_BIND_COMPUTE_RESOURCE     (1 << 16) /* set_compute_resources */
 #define PIPE_BIND_COMMAND_ARGS_BUFFER  (1 << 17) /* pipe_draw_info.indirect */
 #define PIPE_BIND_QUERY_BUFFER         (1 << 18) /* get_query_result_resource */
-#define PIPE_BIND_SAMPLER_REDUCTION_MINMAX (1 << 19) /* PIPE_CAP_SAMPLER_REDUCTION_MINMAX */
 
 /**
  * The first two flags above were previously part of the amorphous
@@ -514,6 +513,7 @@ enum pipe_flush_flags
 #define PIPE_BIND_SHARED      (1 << 20) /* get_texture_handle ??? */
 #define PIPE_BIND_LINEAR      (1 << 21)
 #define PIPE_BIND_PROTECTED   (1 << 22) /* Resource will be protected/encrypted */
+#define PIPE_BIND_SAMPLER_REDUCTION_MINMAX (1 << 23) /* PIPE_CAP_SAMPLER_REDUCTION_MINMAX */
 
 
 /**