mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2026-05-19 09:18:10 +02:00
ddf2aa3a4d
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>
104 lines
4.1 KiB
C
104 lines
4.1 KiB
C
/* Copyright © 2023 Intel Corporation
|
|
* SPDX-License-Identifier: MIT
|
|
*/
|
|
|
|
#include "anv_private.h"
|
|
#include "anv_internal_kernels.h"
|
|
|
|
#include "compiler/nir/nir_builder.h"
|
|
#include "compiler/nir/nir_serialize.h"
|
|
|
|
#if GFX_VERx10 == 90
|
|
# include "intel_gfx90_shaders_binding.h"
|
|
#elif GFX_VERx10 == 110
|
|
# include "intel_gfx110_shaders_binding.h"
|
|
#elif GFX_VERx10 == 120
|
|
# include "intel_gfx120_shaders_binding.h"
|
|
#elif GFX_VERx10 == 125
|
|
# include "intel_gfx125_shaders_binding.h"
|
|
#elif GFX_VERx10 == 200
|
|
# include "intel_gfx200_shaders_binding.h"
|
|
#elif GFX_VERx10 == 300
|
|
# include "intel_gfx300_shaders_binding.h"
|
|
#else
|
|
# error "Unsupported generation"
|
|
#endif
|
|
|
|
#include "genxml/gen_macros.h"
|
|
|
|
#define load_param(b, bit_size, struct_name, field_name) \
|
|
nir_load_uniform(b, 1, bit_size, nir_imm_int(b, 0), \
|
|
.base = offsetof(struct_name, field_name), \
|
|
.range = bit_size / 8)
|
|
|
|
static nir_def *
|
|
load_fragment_index(nir_builder *b)
|
|
{
|
|
nir_def *pos_in = nir_f2i32(b, nir_trim_vector(b, nir_load_frag_coord(b), 2));
|
|
return nir_iadd(b,
|
|
nir_imul_imm(b, nir_channel(b, pos_in, 1), 8192),
|
|
nir_channel(b, pos_in, 0));
|
|
}
|
|
|
|
static nir_def *
|
|
load_compute_index(nir_builder *b)
|
|
{
|
|
return nir_channel(b, nir_load_global_invocation_id(b, 32), 0);
|
|
}
|
|
|
|
uint32_t
|
|
genX(call_internal_shader)(nir_builder *b, enum anv_internal_kernel_name shader_name)
|
|
{
|
|
switch (shader_name) {
|
|
case ANV_INTERNAL_KERNEL_GENERATED_DRAWS:
|
|
genX(libanv_write_draw)(
|
|
b,
|
|
load_param(b, 64, struct anv_gen_indirect_params, generated_cmds_addr),
|
|
load_param(b, 64, struct anv_gen_indirect_params, wa_insts_addr),
|
|
load_param(b, 64, struct anv_gen_indirect_params, indirect_data_addr),
|
|
load_param(b, 64, struct anv_gen_indirect_params, draw_id_addr),
|
|
load_param(b, 32, struct anv_gen_indirect_params, indirect_data_stride),
|
|
load_param(b, 64, struct anv_gen_indirect_params, draw_count_addr),
|
|
load_param(b, 32, struct anv_gen_indirect_params, draw_base),
|
|
load_param(b, 32, struct anv_gen_indirect_params, instance_multiplier),
|
|
load_param(b, 32, struct anv_gen_indirect_params, max_draw_count),
|
|
load_param(b, 32, struct anv_gen_indirect_params, flags),
|
|
load_param(b, 32, struct anv_gen_indirect_params, mocs),
|
|
load_param(b, 32, struct anv_gen_indirect_params, cmd_primitive_size),
|
|
load_param(b, 32, struct anv_gen_indirect_params, ring_count),
|
|
load_param(b, 64, struct anv_gen_indirect_params, gen_addr),
|
|
load_param(b, 64, struct anv_gen_indirect_params, end_addr),
|
|
load_fragment_index(b));
|
|
return sizeof(struct anv_gen_indirect_params);
|
|
|
|
case ANV_INTERNAL_KERNEL_COPY_QUERY_RESULTS_COMPUTE:
|
|
case ANV_INTERNAL_KERNEL_COPY_QUERY_RESULTS_FRAGMENT:
|
|
genX(libanv_query_copy)(
|
|
b,
|
|
load_param(b, 64, struct anv_query_copy_params, destination_addr),
|
|
load_param(b, 32, struct anv_query_copy_params, destination_stride),
|
|
load_param(b, 64, struct anv_query_copy_params, query_data_addr),
|
|
load_param(b, 32, struct anv_query_copy_params, query_base),
|
|
load_param(b, 32, struct anv_query_copy_params, num_queries),
|
|
load_param(b, 32, struct anv_query_copy_params, query_data_offset),
|
|
load_param(b, 32, struct anv_query_copy_params, query_stride),
|
|
load_param(b, 32, struct anv_query_copy_params, num_items),
|
|
load_param(b, 32, struct anv_query_copy_params, flags),
|
|
shader_name == ANV_INTERNAL_KERNEL_COPY_QUERY_RESULTS_COMPUTE ?
|
|
load_compute_index(b) : load_fragment_index(b));
|
|
return sizeof(struct anv_query_copy_params);
|
|
|
|
case ANV_INTERNAL_KERNEL_MEMCPY_COMPUTE:
|
|
genX(libanv_memcpy)(
|
|
b,
|
|
load_param(b, 64, struct anv_memcpy_params, dst_addr),
|
|
load_param(b, 64, struct anv_memcpy_params, src_addr),
|
|
load_param(b, 32, struct anv_memcpy_params, num_dwords),
|
|
nir_imul_imm(b, load_compute_index(b), 4));
|
|
return sizeof(struct anv_memcpy_params);
|
|
|
|
default:
|
|
UNREACHABLE("Invalid shader name");
|
|
break;
|
|
}
|
|
}
|