mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-21 04:38:09 +02:00
In the C23 standard unreachable() is now a predefined function-like macro in <stddef.h> See https://android.googlesource.com/platform/bionic/+/HEAD/docs/c23.md#is-now-a-predefined-function_like-macro-in And this causes build errors when building for C23: ----------------------------------------------------------------------- In file included from ../src/util/log.h:30, from ../src/util/log.c:30: ../src/util/macros.h:123:9: warning: "unreachable" redefined 123 | #define unreachable(str) \ | ^~~~~~~~~~~ In file included from ../src/util/macros.h:31: /usr/lib/gcc/x86_64-linux-gnu/14/include/stddef.h:456:9: note: this is the location of the previous definition 456 | #define unreachable() (__builtin_unreachable ()) | ^~~~~~~~~~~ ----------------------------------------------------------------------- So don't redefine it with the same name, but use the name UNREACHABLE() to also signify it's a macro. Using a different name also makes sense because the behavior of the macro was extending the one of __builtin_unreachable() anyway, and it also had a different signature, accepting one argument, compared to the standard unreachable() with no arguments. This change improves the chances of building mesa with the C23 standard, which for instance is the default in recent AOSP versions. All the instances of the macro, including the definition, were updated with the following command line: git grep -l '[^_]unreachable(' -- "src/**" | sort | uniq | \ while read file; \ do \ sed -e 's/\([^_]\)unreachable(/\1UNREACHABLE(/g' -i "$file"; \ done && \ sed -e 's/#undef unreachable/#undef UNREACHABLE/g' -i src/intel/isl/isl_aux_info.c Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36437>
136 lines
3.8 KiB
C
136 lines
3.8 KiB
C
/*
|
|
* Copyright © 2015 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
* IN THE SOFTWARE.
|
|
*/
|
|
|
|
#include <sys/ioctl.h>
|
|
#include <sys/types.h>
|
|
#include <sys/mman.h>
|
|
#include <string.h>
|
|
#include <errno.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
|
|
#include "anv_private.h"
|
|
#include "common/intel_gem.h"
|
|
|
|
#include "i915/anv_gem.h"
|
|
|
|
/**
|
|
* On error, \a timeout_ns holds the remaining time.
|
|
*/
|
|
int
|
|
anv_gem_wait(struct anv_device *device, uint32_t gem_handle, int64_t *timeout_ns)
|
|
{
|
|
switch (device->info->kmd_type) {
|
|
case INTEL_KMD_TYPE_I915:
|
|
return anv_i915_gem_wait(device, gem_handle, timeout_ns);
|
|
case INTEL_KMD_TYPE_XE:
|
|
return -1;
|
|
default:
|
|
UNREACHABLE("missing");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
/** Return -1 on error. */
|
|
int
|
|
anv_gem_get_tiling(struct anv_device *device, uint32_t gem_handle)
|
|
{
|
|
switch (device->info->kmd_type) {
|
|
case INTEL_KMD_TYPE_I915:
|
|
return anv_i915_gem_get_tiling(device, gem_handle);
|
|
case INTEL_KMD_TYPE_XE:
|
|
return -1;
|
|
default:
|
|
UNREACHABLE("missing");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
anv_gem_set_tiling(struct anv_device *device,
|
|
uint32_t gem_handle, uint32_t stride, uint32_t tiling)
|
|
{
|
|
switch (device->info->kmd_type) {
|
|
case INTEL_KMD_TYPE_I915:
|
|
return anv_i915_gem_set_tiling(device, gem_handle, stride, tiling);
|
|
case INTEL_KMD_TYPE_XE:
|
|
return 0;
|
|
default:
|
|
UNREACHABLE("missing");
|
|
return -1;
|
|
}
|
|
}
|
|
|
|
int
|
|
anv_gem_handle_to_fd(struct anv_device *device, uint32_t gem_handle)
|
|
{
|
|
struct drm_prime_handle args = {
|
|
.handle = gem_handle,
|
|
.flags = DRM_CLOEXEC | DRM_RDWR,
|
|
};
|
|
|
|
int ret = intel_ioctl(device->fd, DRM_IOCTL_PRIME_HANDLE_TO_FD, &args);
|
|
if (ret == -1)
|
|
return -1;
|
|
|
|
return args.fd;
|
|
}
|
|
|
|
uint32_t
|
|
anv_gem_fd_to_handle(struct anv_device *device, int fd)
|
|
{
|
|
struct drm_prime_handle args = {
|
|
.fd = fd,
|
|
};
|
|
|
|
int ret = intel_ioctl(device->fd, DRM_IOCTL_PRIME_FD_TO_HANDLE, &args);
|
|
if (ret == -1)
|
|
return 0;
|
|
|
|
return args.handle;
|
|
}
|
|
|
|
VkResult
|
|
anv_gem_import_bo_alloc_flags_to_bo_flags(struct anv_device *device,
|
|
struct anv_bo *bo,
|
|
enum anv_bo_alloc_flags alloc_flags,
|
|
uint32_t *bo_flags)
|
|
{
|
|
switch (device->info->kmd_type) {
|
|
case INTEL_KMD_TYPE_I915:
|
|
return anv_i915_gem_import_bo_alloc_flags_to_bo_flags(device, bo,
|
|
alloc_flags,
|
|
bo_flags);
|
|
case INTEL_KMD_TYPE_XE:
|
|
*bo_flags = device->kmd_backend->bo_alloc_flags_to_bo_flags(device, alloc_flags);
|
|
return VK_SUCCESS;
|
|
default:
|
|
UNREACHABLE("missing");
|
|
return VK_ERROR_UNKNOWN;
|
|
}
|
|
}
|
|
|
|
const struct anv_kmd_backend *anv_stub_kmd_backend_get(void)
|
|
{
|
|
return NULL;
|
|
}
|