AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gallium: Fix PIPE_BIND_SAMPLER_REDUCTION_MINMAX definition to be unique

Browse Source 
This accidentally collided with PIPE_BIND_SCANOUT.

Fixes: 59ad872458 gallium: add PIPE_BIND_SAMPLER_REDUCTION_MINMAX
Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10397>
This commit is contained in:
Adam Jackson
2021-04-21 18:26:23 -04:00
committed by Marge Bot
parent fca09eb8f3
commit 62f3507aea
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/include/pipe/p_defines.h
+1 -1
View File
@@ -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 */
/**