diff options
| author | Yonggang Luo <luoyonggang@gmail.com> | 2022-11-11 18:59:21 +0800 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2022-11-15 20:35:55 +0000 |
| commit | 80fac8637b9d8e1b7ec3c63e46e435f600e93c29 (patch) | |
| tree | f98e50e31fc16ce595a17cb85956be164fe05eac /src/gallium/winsys/svga | |
| parent | 4304177675ae7717919ed8accc45397db44eb10d (diff) | |
tree-wide: Convert all usage of defined(PIPE_(OS|ARCH|CC)_*) to DETECT_(OS|ARCH|CC)_* by use grep
From:
defined[\s]*\([\s]*PIPE_(OS|ARCH|CC)_([0-9A-Z_]+)[\s]*\)
To:
DETECT_$1_$2
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19674>
Diffstat (limited to 'src/gallium/winsys/svga')
| -rw-r--r-- | src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c | 4 | ||||
| -rw-r--r-- | src/gallium/winsys/svga/drm/vmw_msg.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c index 4b83bc2a86b..b754a066a9e 100644 --- a/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c +++ b/src/gallium/winsys/svga/drm/pb_buffer_simple_fenced.c @@ -36,7 +36,7 @@ #include "util/detect.h" -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) +#if DETECT_OS_LINUX || DETECT_OS_BSD || DETECT_OS_SOLARIS #include <unistd.h> #include <sched.h> #endif @@ -796,7 +796,7 @@ fenced_bufmgr_destroy(struct pb_manager *mgr) /* Wait on outstanding fences */ while (fenced_mgr->num_fenced) { mtx_unlock(&fenced_mgr->mutex); -#if defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_SOLARIS) +#if DETECT_OS_LINUX || DETECT_OS_BSD || DETECT_OS_SOLARIS sched_yield(); #endif mtx_lock(&fenced_mgr->mutex); diff --git a/src/gallium/winsys/svga/drm/vmw_msg.c b/src/gallium/winsys/svga/drm/vmw_msg.c index cc00b8ebc33..cacd8d53ccd 100644 --- a/src/gallium/winsys/svga/drm/vmw_msg.c +++ b/src/gallium/winsys/svga/drm/vmw_msg.c @@ -61,7 +61,7 @@ #define HIGH_WORD(X) ((X & 0xFFFF0000) >> 16) -#if defined(PIPE_CC_GCC) && (PIPE_CC_GCC_VERSION > 502) && (defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64)) +#if DETECT_CC_GCC && (PIPE_CC_GCC_VERSION > 502) && (DETECT_ARCH_X86 || DETECT_ARCH_X86_64) /** * Hypervisor-specific bi-directional communication channel. Should never @@ -124,7 +124,7 @@ * @si: [OUT] * @di: [OUT] */ -#if defined(PIPE_ARCH_X86_64) +#if DETECT_ARCH_X86_64 typedef uint64_t VMW_REG; |