fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 22:38:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: renumber PIPE_MAP_* enums to remove holes

Browse source 
We could change the type into 16 bits if needed.

PB_USAGE flags need to match PIPE_MAP flags due to static assertions.

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10527>
This commit is contained in:
Marek Olšák 2021-04-21 23:40:26 -04:00 • committed by Marge Bot
parent 22575a7b11
commit 00c30dad78
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/auxiliary/pipebuffer/pb_buffer.h
View file

@ -64,13 +64,13 @@ enum pb_usage_flags {
PB_USAGE_CPU_WRITE = (1 << 1), PB_USAGE_CPU_WRITE = (1 << 1),
PB_USAGE_GPU_READ = (1 << 2), PB_USAGE_GPU_READ = (1 << 2),
PB_USAGE_GPU_WRITE = (1 << 3), PB_USAGE_GPU_WRITE = (1 << 3),
PB_USAGE_DONTBLOCK = (1 << 9), PB_USAGE_DONTBLOCK = (1 << 4),
PB_USAGE_UNSYNCHRONIZED = (1 << 10), PB_USAGE_UNSYNCHRONIZED = (1 << 5),
/* Persistent mappings may remain across a flush. Note that contrary /* Persistent mappings may remain across a flush. Note that contrary
* to OpenGL persistent maps, there is no requirement at the pipebuffer * to OpenGL persistent maps, there is no requirement at the pipebuffer
* api level to explicitly enforce coherency by barriers or range flushes. * api level to explicitly enforce coherency by barriers or range flushes.
*/ */
PB_USAGE_PERSISTENT = (1 << 13) PB_USAGE_PERSISTENT = (1 << 8)
}; };
/* For error checking elsewhere */ /* For error checking elsewhere */

4
src/gallium/drivers/iris/iris_bufmgr.h
View file

@ -298,8 +298,8 @@ void iris_bo_unreference(struct iris_bo *bo);
#define MAP_PERSISTENT PIPE_MAP_PERSISTENT #define MAP_PERSISTENT PIPE_MAP_PERSISTENT
#define MAP_COHERENT PIPE_MAP_COHERENT #define MAP_COHERENT PIPE_MAP_COHERENT
/* internal */ /* internal */
#define MAP_INTERNAL_MASK (0xffu << 24) #define MAP_RAW (PIPE_MAP_DRV_PRV << 0)
#define MAP_RAW (0x01 << 24) #define MAP_INTERNAL_MASK (MAP_RAW)
#define MAP_FLAGS (MAP_READ | MAP_WRITE | MAP_ASYNC | \ #define MAP_FLAGS (MAP_READ | MAP_WRITE | MAP_ASYNC | \
MAP_PERSISTENT | MAP_COHERENT | MAP_INTERNAL_MASK) MAP_PERSISTENT | MAP_COHERENT | MAP_INTERNAL_MASK)

30
src/gallium/include/pipe/p_defines.h
View file

@ -246,13 +246,13 @@ enum pipe_map_flags
* Resource contents read back (or accessed directly) at transfer * Resource contents read back (or accessed directly) at transfer
* create time. * create time.
*/ */
PIPE_MAP_READ = (1 << 0), PIPE_MAP_READ = 1 << 0,
/** /**
* Resource contents will be written back at transfer_unmap * Resource contents will be written back at transfer_unmap
* time (or modified as a result of being accessed directly). * time (or modified as a result of being accessed directly).
*/ */
PIPE_MAP_WRITE = (1 << 1), PIPE_MAP_WRITE = 1 << 1,
/** /**
* Read/modify/write * Read/modify/write
@ -270,7 +270,7 @@ enum pipe_map_flags
* *
* This flag supresses implicit "DISCARD" for buffer_subdata. * This flag supresses implicit "DISCARD" for buffer_subdata.
*/ */
PIPE_MAP_DIRECTLY = (1 << 2), PIPE_MAP_DIRECTLY = 1 << 2,
/** /**
* Discards the memory within the mapped region. * Discards the memory within the mapped region.
@ -280,7 +280,7 @@ enum pipe_map_flags
* See also: * See also:
* - OpenGL's ARB_map_buffer_range extension, MAP_INVALIDATE_RANGE_BIT flag. * - OpenGL's ARB_map_buffer_range extension, MAP_INVALIDATE_RANGE_BIT flag.
*/ */
PIPE_MAP_DISCARD_RANGE = (1 << 8), PIPE_MAP_DISCARD_RANGE = 1 << 3,
/** /**
* Fail if the resource cannot be mapped immediately. * Fail if the resource cannot be mapped immediately.
@ -290,7 +290,7 @@ enum pipe_map_flags
* - Mesa's MESA_MAP_NOWAIT_BIT flag. * - Mesa's MESA_MAP_NOWAIT_BIT flag.
* - WDDM's D3DDDICB_LOCKFLAGS.DonotWait flag. * - WDDM's D3DDDICB_LOCKFLAGS.DonotWait flag.
*/ */
PIPE_MAP_DONTBLOCK = (1 << 9), PIPE_MAP_DONTBLOCK = 1 << 4,
/** /**
* Do not attempt to synchronize pending operations on the resource when mapping. * Do not attempt to synchronize pending operations on the resource when mapping.
@ -302,7 +302,7 @@ enum pipe_map_flags
* - Direct3D's D3DLOCK_NOOVERWRITE flag. * - Direct3D's D3DLOCK_NOOVERWRITE flag.
* - WDDM's D3DDDICB_LOCKFLAGS.IgnoreSync flag. * - WDDM's D3DDDICB_LOCKFLAGS.IgnoreSync flag.
*/ */
PIPE_MAP_UNSYNCHRONIZED = (1 << 10), PIPE_MAP_UNSYNCHRONIZED = 1 << 5,
/** /**
* Written ranges will be notified later with * Written ranges will be notified later with
@ -314,7 +314,7 @@ enum pipe_map_flags
* - pipe_context::transfer_flush_region * - pipe_context::transfer_flush_region
* - OpenGL's ARB_map_buffer_range extension, MAP_FLUSH_EXPLICIT_BIT flag. * - OpenGL's ARB_map_buffer_range extension, MAP_FLUSH_EXPLICIT_BIT flag.
*/ */
PIPE_MAP_FLUSH_EXPLICIT = (1 << 11), PIPE_MAP_FLUSH_EXPLICIT = 1 << 6,
/** /**
* Discards all memory backing the resource. * Discards all memory backing the resource.
@ -329,7 +329,7 @@ enum pipe_map_flags
* - D3D10 DDI's D3D10_DDI_MAP_WRITE_DISCARD flag * - D3D10 DDI's D3D10_DDI_MAP_WRITE_DISCARD flag
* - D3D10's D3D10_MAP_WRITE_DISCARD flag. * - D3D10's D3D10_MAP_WRITE_DISCARD flag.
*/ */
PIPE_MAP_DISCARD_WHOLE_RESOURCE = (1 << 12), PIPE_MAP_DISCARD_WHOLE_RESOURCE = 1 << 7,
/** /**
* Allows the resource to be used for rendering while mapped. * Allows the resource to be used for rendering while mapped.
@ -340,7 +340,7 @@ enum pipe_map_flags
* If COHERENT is not set, memory_barrier(PIPE_BARRIER_MAPPED_BUFFER) * If COHERENT is not set, memory_barrier(PIPE_BARRIER_MAPPED_BUFFER)
* must be called to ensure the device can see what the CPU has written. * must be called to ensure the device can see what the CPU has written.
*/ */
PIPE_MAP_PERSISTENT = (1 << 13), PIPE_MAP_PERSISTENT = 1 << 8,
/** /**
* If PERSISTENT is set, this ensures any writes done by the device are * If PERSISTENT is set, this ensures any writes done by the device are
@ -349,35 +349,35 @@ enum pipe_map_flags
* PIPE_RESOURCE_FLAG_MAP_COHERENT must be set when creating * PIPE_RESOURCE_FLAG_MAP_COHERENT must be set when creating
* the resource. * the resource.
*/ */
PIPE_MAP_COHERENT = (1 << 14), PIPE_MAP_COHERENT = 1 << 9,
/** /**
* Map a resource in a thread-safe manner, because the calling thread can * Map a resource in a thread-safe manner, because the calling thread can
* be any thread. It can only be used if both WRITE and UNSYNCHRONIZED are * be any thread. It can only be used if both WRITE and UNSYNCHRONIZED are
* set. * set.
*/ */
PIPE_MAP_THREAD_SAFE = 1 << 15, PIPE_MAP_THREAD_SAFE = 1 << 10,
/** /**
* Map only the depth aspect of a resource * Map only the depth aspect of a resource
*/ */
PIPE_MAP_DEPTH_ONLY = 1 << 16, PIPE_MAP_DEPTH_ONLY = 1 << 11,
/** /**
* Map only the stencil aspect of a resource * Map only the stencil aspect of a resource
*/ */
PIPE_MAP_STENCIL_ONLY = 1 << 17, PIPE_MAP_STENCIL_ONLY = 1 << 12,
/** /**
* Mapping will be used only once (never remapped). * Mapping will be used only once (never remapped).
*/ */
PIPE_MAP_ONCE = 1 << 18, PIPE_MAP_ONCE = 1 << 13,
/** /**
* This and higher bits are reserved for private use by drivers. Drivers * This and higher bits are reserved for private use by drivers. Drivers
* should use this as (PIPE_MAP_DRV_PRV << i). * should use this as (PIPE_MAP_DRV_PRV << i).
*/ */
PIPE_MAP_DRV_PRV = (1 << 24) PIPE_MAP_DRV_PRV = 1 << 14,
}; };
/** /**