diff options
| author | Danylo Piliaiev <dpiliaiev@igalia.com> | 2023-03-08 13:45:41 +0100 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-24 15:49:25 +0000 |
| commit | 8baa7acd821ff0f2eb9cc0d21bf825c6718dbed7 (patch) | |
| tree | ed9a19df786f316724692a7d4cdda9acc8082cef /include | |
| parent | ae47b4e93785f91a39f4bce419b8b6e93d0868b1 (diff) | |
| download | mesa-8baa7acd821ff0f2eb9cc0d21bf825c6718dbed7.tar.gz | |
freedreno/msm: Rename drm_msm_gem_submit_reloc::or in C++ code
Clashes with C++ `or` keyword
Signed-off-by: Danylo Piliaiev <dpiliaiev@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21931>
Diffstat (limited to 'include')
| -rw-r--r-- | include/drm-uapi/msm_drm.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/drm-uapi/msm_drm.h b/include/drm-uapi/msm_drm.h index 3c7b097c4e3..16f2eb4b65e 100644 --- a/include/drm-uapi/msm_drm.h +++ b/include/drm-uapi/msm_drm.h @@ -180,7 +180,11 @@ struct drm_msm_gem_cpu_fini { */ struct drm_msm_gem_submit_reloc { __u32 submit_offset; /* in, offset from submit_bo */ +#ifdef __cplusplus + __u32 _or; /* in, value OR'd with result */ +#else __u32 or; /* in, value OR'd with result */ +#endif __s32 shift; /* in, amount of left shift (can be negative) */ __u32 reloc_idx; /* in, index of reloc_bo buffer */ __u64 reloc_offset; /* in, offset from start of reloc_bo */ |