Antonio Ospite
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>
99 lines
3.5 KiB
C++
99 lines
3.5 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 "elk_vec4_gs_visitor.h"
|
|
|
|
namespace elk {
|
|
|
|
void
|
|
vec4_gs_visitor::nir_emit_intrinsic(nir_intrinsic_instr *instr)
|
|
{
|
|
dst_reg dest;
|
|
src_reg src;
|
|
|
|
switch (instr->intrinsic) {
|
|
case nir_intrinsic_load_per_vertex_input: {
|
|
assert(instr->def.bit_size == 32);
|
|
/* The EmitNoIndirectInput flag guarantees our vertex index will
|
|
* be constant. We should handle indirects someday.
|
|
*/
|
|
const unsigned vertex = nir_src_as_uint(instr->src[0]);
|
|
const unsigned offset_reg = nir_src_as_uint(instr->src[1]);
|
|
|
|
const unsigned input_array_stride = prog_data->urb_read_length * 2;
|
|
|
|
/* Make up a type...we have no way of knowing... */
|
|
const glsl_type *const type = glsl_ivec_type(instr->num_components);
|
|
|
|
src = src_reg(ATTR, input_array_stride * vertex +
|
|
nir_intrinsic_base(instr) + offset_reg,
|
|
type);
|
|
src.swizzle = ELK_SWZ_COMP_INPUT(nir_intrinsic_component(instr));
|
|
|
|
dest = get_nir_def(instr->def, src.type);
|
|
dest.writemask = elk_writemask_for_size(instr->num_components);
|
|
emit(MOV(dest, src));
|
|
break;
|
|
}
|
|
|
|
case nir_intrinsic_load_input:
|
|
UNREACHABLE("nir_lower_io should have produced per_vertex intrinsics");
|
|
|
|
case nir_intrinsic_emit_vertex_with_counter:
|
|
this->vertex_count =
|
|
retype(get_nir_src(instr->src[0], 1), ELK_REGISTER_TYPE_UD);
|
|
gs_emit_vertex(nir_intrinsic_stream_id(instr));
|
|
break;
|
|
|
|
case nir_intrinsic_end_primitive_with_counter:
|
|
this->vertex_count =
|
|
retype(get_nir_src(instr->src[0], 1), ELK_REGISTER_TYPE_UD);
|
|
gs_end_primitive();
|
|
break;
|
|
|
|
case nir_intrinsic_set_vertex_and_primitive_count:
|
|
this->vertex_count =
|
|
retype(get_nir_src(instr->src[0], 1), ELK_REGISTER_TYPE_UD);
|
|
break;
|
|
|
|
case nir_intrinsic_load_primitive_id:
|
|
assert(gs_prog_data->include_primitive_id);
|
|
dest = get_nir_def(instr->def, ELK_REGISTER_TYPE_D);
|
|
emit(MOV(dest, retype(elk_vec4_grf(1, 0), ELK_REGISTER_TYPE_D)));
|
|
break;
|
|
|
|
case nir_intrinsic_load_invocation_id: {
|
|
dest = get_nir_def(instr->def, ELK_REGISTER_TYPE_D);
|
|
if (gs_prog_data->invocations > 1)
|
|
emit(ELK_GS_OPCODE_GET_INSTANCE_ID, dest);
|
|
else
|
|
emit(MOV(dest, elk_imm_ud(0)));
|
|
break;
|
|
}
|
|
|
|
default:
|
|
vec4_visitor::nir_emit_intrinsic(instr);
|
|
}
|
|
}
|
|
}
|