godotengine/godot-nir-static
1
0
Fork 0
mirror of https://github.com/godotengine/godot-nir-static.git synced 2025-12-31 13:48:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade Mesa version to 25.3.1.

Browse Source
This commit is contained in:
Skyth
2025-12-09 14:03:25 +03:00
parent 7719abc192
commit 1bdec2ab6a
5 changed files with 356 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/ci.yaml vendored
View File

@@ -100,6 +100,10 @@ jobs:
run: | run: |
python -m pip install mako python -m pip install mako
- name: Install pyyaml
run: |
python -m pip install pyyaml
- name: Setup MinGW/LLVM - name: Setup MinGW/LLVM
if: ${{ matrix.platform == 'windows' && matrix.llvm == 'yes' }} if: ${{ matrix.platform == 'windows' && matrix.llvm == 'yes' }}
run: | run: |

19
SConstruct
View File

@@ -215,12 +215,12 @@ custom_build_steps = [
], ],
["src/compiler/nir", "nir_builder_opcodes_h.py > %s/nir_builder_opcodes.h", "nir_builder_opcodes.h"], ["src/compiler/nir", "nir_builder_opcodes_h.py > %s/nir_builder_opcodes.h", "nir_builder_opcodes.h"],
["src/compiler/nir", "nir_constant_expressions.py > %s/nir_constant_expressions.c", "nir_constant_expressions.c"], ["src/compiler/nir", "nir_constant_expressions.py > %s/nir_constant_expressions.c", "nir_constant_expressions.c"],
["src/compiler/nir", "nir_intrinsics_h.py --outdir %s", "nir_intrinsics.h"], ["src/compiler/nir", "nir_intrinsics_h.py --out %s/nir_intrinsics.h", "nir_intrinsics.h"],
["src/compiler/nir", "nir_intrinsics_c.py --outdir %s", "nir_intrinsics.c"], ["src/compiler/nir", "nir_intrinsics_c.py --out %s/nir_intrinsics.c", "nir_intrinsics.c"],
["src/compiler/nir", "nir_intrinsics_indices_h.py --outdir %s", "nir_intrinsics_indices.h"], ["src/compiler/nir", "nir_intrinsics_indices_h.py --out %s/nir_intrinsics_indices.h", "nir_intrinsics_indices.h"],
["src/compiler/nir", "nir_opcodes_h.py > %s/nir_opcodes.h", "nir_opcodes.h"], ["src/compiler/nir", "nir_opcodes_h.py > %s/nir_opcodes.h", "nir_opcodes.h"],
["src/compiler/nir", "nir_opcodes_c.py > %s/nir_opcodes.c", "nir_opcodes.c"], ["src/compiler/nir", "nir_opcodes_c.py > %s/nir_opcodes.c", "nir_opcodes.c"],
["src/compiler/nir", "nir_opt_algebraic.py > %s/nir_opt_algebraic.c", "nir_opt_algebraic.c"], ["src/compiler/nir", "nir_opt_algebraic.py --out %s/nir_opt_algebraic.c", "nir_opt_algebraic.c"],
["src/compiler/spirv", "vtn_generator_ids_h.py spir-v.xml %s/vtn_generator_ids.h", "vtn_generator_ids.h"], ["src/compiler/spirv", "vtn_generator_ids_h.py spir-v.xml %s/vtn_generator_ids.h", "vtn_generator_ids.h"],
[ [
"src/microsoft/compiler", "src/microsoft/compiler",
@@ -228,8 +228,11 @@ custom_build_steps = [
"dxil_nir_algebraic.c", "dxil_nir_algebraic.c",
], ],
["src/util", "format_srgb.py > %s/format_srgb.c", "format_srgb.c"], ["src/util", "format_srgb.py > %s/format_srgb.c", "format_srgb.c"],
["src/util/format", "u_format_table.py u_format.csv --header > %s/u_format_pack.h", "u_format_pack.h"], ["src/util/format", "u_format_table.py u_format.yaml --enums > %s/u_format_gen.h", "u_format_gen.h"],
["src/util/format", "u_format_table.py u_format.csv > %s/u_format_table.c", "u_format_table.c"], ["src/util/format", "u_format_table.py u_format.yaml --header > %s/u_format_pack.h", "u_format_pack.h"],
["src/util/format", "u_format_table.py u_format.yaml > %s/u_format_table.c", "u_format_table.c"],
["src/compiler", "builtin_types_h.py %s/builtin_types.h", "builtin_types.h"],
["src/compiler", "builtin_types_c.py %s/builtin_types.c", "builtin_types.c"],
] ]
mesa_sources = [] mesa_sources = []
@@ -304,6 +307,10 @@ extra_defines += [
("PACKAGE_BUGREPORT", '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'), ("PACKAGE_BUGREPORT", '\\"https://gitlab.freedesktop.org/mesa/mesa/-/issues\\"'),
"PIPE_SUBSYSTEM_WINDOWS_USER", "PIPE_SUBSYSTEM_WINDOWS_USER",
"_USE_MATH_DEFINES", "_USE_MATH_DEFINES",
"BLAKE3_NO_SSE2",
"BLAKE3_NO_SSE41",
"BLAKE3_NO_AVX2",
"BLAKE3_NO_AVX512",
] ]
if env.get("is_msvc", False): if env.get("is_msvc", False):

428
godot-patches/01_godot_nir_goodies.patch
View File

@@ -1,47 +1,94 @@
diff --git a/godot-mesa/src/compiler/nir/nir_dominance_lca.c b/godot-mesa/src/compiler/nir/nir_dominance_lca.c
index 84a7f1d..40c0811 100644
--- a/godot-mesa/src/compiler/nir/nir_dominance_lca.c
+++ b/godot-mesa/src/compiler/nir/nir_dominance_lca.c
@@ -167,7 +167,7 @@ nir_dominance_lca(nir_block *b1, nir_block *b2)
uint32_t i1 = dom_lca_representative(b1);
uint32_t i2 = dom_lca_representative(b2);
if (i1 > i2)
- SWAP(i1, i2);
+ MESA_SWAP(i1, i2);
uint32_t index = range_minimum_query(&impl->dom_lca_info.table, i1, i2 + 1);
nir_block *result = impl->dom_lca_info.block_from_idx[index];
diff --git a/godot-mesa/src/compiler/nir/nir_intrinsics.py b/godot-mesa/src/compiler/nir/nir_intrinsics.py diff --git a/godot-mesa/src/compiler/nir/nir_intrinsics.py b/godot-mesa/src/compiler/nir/nir_intrinsics.py
index 7474afb..119b832 100644 index 41371db..dd3454f 100644
--- a/godot-mesa/src/compiler/nir/nir_intrinsics.py --- a/godot-mesa/src/compiler/nir/nir_intrinsics.py
+++ b/godot-mesa/src/compiler/nir/nir_intrinsics.py +++ b/godot-mesa/src/compiler/nir/nir_intrinsics.py
@@ -1046,6 +1046,9 @@ load("push_constant", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINAT @@ -1262,6 +1262,9 @@ load("push_constant", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINAT
# src[] = { offset }. # src[] = { offset }.
load("constant", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET], load("constant", [1], [BASE, RANGE, ACCESS, ALIGN_MUL, ALIGN_OFFSET],
[CAN_ELIMINATE, CAN_REORDER]) [CAN_ELIMINATE, CAN_REORDER])
+# src[] = { offset }. +# src[] = { offset }.
+load("constant_non_opt", [1], [BASE, RANGE, ALIGN_MUL, ALIGN_OFFSET], +load("constant_non_opt", [1], [BASE, RANGE, ACCESS, ALIGN_MUL, ALIGN_OFFSET],
+ [CAN_ELIMINATE, CAN_REORDER]) + [CAN_ELIMINATE, CAN_REORDER])
# src[] = { address }. # src[] = { address }.
load("global", [1], [ACCESS, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINATE]) load("global", [1], [ACCESS, ALIGN_MUL, ALIGN_OFFSET], [CAN_ELIMINATE])
# src[] = { address }. # src[] = { base_address, offset, bound }.
diff --git a/godot-mesa/src/compiler/nir/nir_loop_analyze.c b/godot-mesa/src/compiler/nir/nir_loop_analyze.c
index aa7369c..34b8a99 100644
--- a/godot-mesa/src/compiler/nir/nir_loop_analyze.c
+++ b/godot-mesa/src/compiler/nir/nir_loop_analyze.c
@@ -1020,7 +1020,7 @@ try_find_trip_count_vars_in_logical_op(nir_scalar *cond,
if (!nir_scalar_is_alu(logical_op) || !nir_scalar_is_const(zero)) {
/* Maybe we had it the wrong way, flip things around */
- SWAP(zero, logical_op);
+ MESA_SWAP(zero, logical_op);
/* If we still didn't find what we need then return */
if (!nir_scalar_is_const(zero))
diff --git a/godot-mesa/src/compiler/nir/nir_lower_cooperative_matrix.c b/godot-mesa/src/compiler/nir/nir_lower_cooperative_matrix.c
index 830746b..74c8df6 100644
--- a/godot-mesa/src/compiler/nir/nir_lower_cooperative_matrix.c
+++ b/godot-mesa/src/compiler/nir/nir_lower_cooperative_matrix.c
@@ -530,7 +530,7 @@ split_cmat_load_store(nir_builder *b,
col_offset = (i / split->num_col_splits) * desc.rows;
if (layout == GLSL_MATRIX_LAYOUT_ROW_MAJOR)
- SWAP(row_offset, col_offset);
+ MESA_SWAP(row_offset, col_offset);
ptr_deref = nir_build_deref_cast(b, &addr_deref->def, addr_deref->modes, scalar_type, elem_size);
stride = nir_udiv_imm(b, nir_imul_imm(b, stride, deref_bytes_size), elem_size);
diff --git a/godot-mesa/src/compiler/nir/nir_opt_reassociate.c b/godot-mesa/src/compiler/nir/nir_opt_reassociate.c
index 09566a5..15c5ad1 100644
--- a/godot-mesa/src/compiler/nir/nir_opt_reassociate.c
+++ b/godot-mesa/src/compiler/nir/nir_opt_reassociate.c
@@ -118,7 +118,7 @@ get_pair_key(nir_op op, nir_scalar a, nir_scalar b)
if ((a.def->index > b.def->index) ||
((a.def->index == b.def->index) && (a.comp > b.comp))) {
- SWAP(a, b);
+ MESA_SWAP(a, b);
}
return (struct pair_key){
@@ -460,8 +460,8 @@ reassociate_chain(struct chain *c, void *pair_freq)
if (best_pair.i != best_pair.j) {
/* Pin the best pair at the front. The rest is sorted by rank. */
- SWAP(c->srcs[0], c->srcs[best_pair.i]);
- SWAP(c->srcs[1], c->srcs[best_pair.j]);
+ MESA_SWAP(c->srcs[0], c->srcs[best_pair.i]);
+ MESA_SWAP(c->srcs[1], c->srcs[best_pair.j]);
pinned = 2;
}
}
diff --git a/godot-mesa/src/compiler/spirv/spirv_to_nir.c b/godot-mesa/src/compiler/spirv/spirv_to_nir.c diff --git a/godot-mesa/src/compiler/spirv/spirv_to_nir.c b/godot-mesa/src/compiler/spirv/spirv_to_nir.c
index 6f87ff9..3684b32 100644 index 7150419..61b0b7c 100644
--- a/godot-mesa/src/compiler/spirv/spirv_to_nir.c --- a/godot-mesa/src/compiler/spirv/spirv_to_nir.c
+++ b/godot-mesa/src/compiler/spirv/spirv_to_nir.c +++ b/godot-mesa/src/compiler/spirv/spirv_to_nir.c
@@ -39,6 +39,8 @@ @@ -45,6 +45,8 @@
#include <stdio.h> #include <stdio.h>
+#include "drivers/d3d12/d3d12_godot_nir_bridge.h" +#include "drivers/d3d12/d3d12_godot_nir_bridge.h"
+ +
#ifndef NDEBUG #ifndef PATH_MAX
uint32_t mesa_spirv_debug = 0; #define PATH_MAX 4096
#endif
@@ -1121,6 +1123,7 @@ struct_member_decoration_cb(struct vtn_builder *b, @@ -2481,7 +2483,7 @@ vtn_null_constant(struct vtn_builder *b, struct vtn_type *type)
case SpvDecorationPerPrimitiveNV:
case SpvDecorationPerTaskNV:
case SpvDecorationPerViewNV:
+ case SpvDecorationInvariant: /* Silence this one to avoid warning spam. */
break;
case SpvDecorationSpecId:
@@ -1129,7 +1132,6 @@ struct_member_decoration_cb(struct vtn_builder *b,
case SpvDecorationArrayStride:
case SpvDecorationGLSLShared:
case SpvDecorationGLSLPacked:
- case SpvDecorationInvariant:
case SpvDecorationAliased:
case SpvDecorationConstant:
case SpvDecorationIndex:
@@ -1942,7 +1944,7 @@ vtn_null_constant(struct vtn_builder *b, struct vtn_type *type)
} }
static void static void
@@ -50,7 +97,7 @@ index 6f87ff9..3684b32 100644
ASSERTED int member, ASSERTED int member,
const struct vtn_decoration *dec, void *data) const struct vtn_decoration *dec, void *data)
{ {
@@ -1950,13 +1952,8 @@ spec_constant_decoration_cb(struct vtn_builder *b, UNUSED struct vtn_value *val, @@ -2489,13 +2491,8 @@ spec_constant_decoration_cb(struct vtn_builder *b, UNUSED struct vtn_value *val,
if (dec->decoration != SpvDecorationSpecId) if (dec->decoration != SpvDecorationSpecId)
return; return;
@@ -66,7 +113,7 @@ index 6f87ff9..3684b32 100644
} }
static void static void
@@ -1980,6 +1977,12 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, @@ -2519,6 +2516,12 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
const uint32_t *w, unsigned count) const uint32_t *w, unsigned count)
{ {
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_constant); struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_constant);
@@ -79,7 +126,7 @@ index 6f87ff9..3684b32 100644
val->constant = rzalloc(b, nir_constant); val->constant = rzalloc(b, nir_constant);
switch (opcode) { switch (opcode) {
case SpvOpConstantTrue: case SpvOpConstantTrue:
@@ -1997,7 +2000,7 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, @@ -2536,7 +2539,7 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
if (opcode == SpvOpSpecConstantTrue || if (opcode == SpvOpSpecConstantTrue ||
opcode == SpvOpSpecConstantFalse) opcode == SpvOpSpecConstantFalse)
@@ -88,7 +135,7 @@ index 6f87ff9..3684b32 100644
val->constant->values[0].b = u32val.u32 != 0; val->constant->values[0].b = u32val.u32 != 0;
break; break;
@@ -2028,11 +2031,10 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, @@ -2567,14 +2570,12 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
if (opcode == SpvOpSpecConstant) if (opcode == SpvOpSpecConstant)
vtn_foreach_decoration(b, val, spec_constant_decoration_cb, vtn_foreach_decoration(b, val, spec_constant_decoration_cb,
@@ -98,10 +145,14 @@ index 6f87ff9..3684b32 100644
} }
- case SpvOpSpecConstantComposite: - case SpvOpSpecConstantComposite:
case SpvOpConstantComposite: { case SpvOpConstantComposite:
unsigned elem_count = count - 3; - case SpvOpConstantCompositeReplicateEXT:
vtn_fail_if(elem_count != val->type->length, - case SpvOpSpecConstantCompositeReplicateEXT: {
@@ -2080,218 +2082,6 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode, + case SpvOpConstantCompositeReplicateEXT: {
const unsigned elem_count =
val->type->base_type == vtn_base_type_cooperative_matrix ?
1 : val->type->length;
@@ -2648,315 +2649,6 @@ vtn_handle_constant(struct vtn_builder *b, SpvOp opcode,
break; break;
} }
@@ -110,6 +161,54 @@ index 6f87ff9..3684b32 100644
- vtn_foreach_decoration(b, val, spec_constant_decoration_cb, &u32op); - vtn_foreach_decoration(b, val, spec_constant_decoration_cb, &u32op);
- SpvOp opcode = u32op.u32; - SpvOp opcode = u32op.u32;
- switch (opcode) { - switch (opcode) {
- case SpvOpBitcast: {
- struct vtn_value *src = &b->values[w[4]];
-
- vtn_assert(src->value_type == vtn_value_type_constant ||
- src->value_type == vtn_value_type_undef);
-
- unsigned src_len = glsl_get_vector_elements(src->type->type);
- unsigned dst_len = glsl_get_vector_elements(val->type->type);
-
- unsigned src_bit_size = glsl_get_bit_size(src->type->type);
- unsigned dst_bit_size = glsl_get_bit_size(val->type->type);
-
- vtn_assert(src_len * src_bit_size == dst_len * dst_bit_size);
-
- /* This will end up being zero */
- if (src->value_type == vtn_value_type_undef)
- break;
-
- if (src_bit_size == dst_bit_size) {
- /* This is just a copy */
- for (unsigned i = 0; i < src_len; i++)
- val->constant->values[i] = src->constant->values[i];
- } else {
- /* You can't non-trivially bitcast booleans */
- vtn_assert(src_bit_size >= 8 && dst_bit_size >= 8);
- const unsigned src_byte_size = src_bit_size / 8;
- const unsigned dst_byte_size = dst_bit_size / 8;
-
- vtn_assert(src_len <= NIR_MAX_VEC_COMPONENTS &&
- dst_len <= NIR_MAX_VEC_COMPONENTS);
-
- uint8_t bits[NIR_MAX_VEC_COMPONENTS * sizeof(nir_const_value)];
-
- for (unsigned i = 0; i < src_len; i++) {
- uint64_t v = nir_const_value_as_int(src->constant->values[i],
- src_bit_size);
- memcpy(bits + i * src_byte_size, &v, src_byte_size);
- }
-
- for (unsigned i = 0; i < dst_len; i++) {
- uint64_t v = 0;
- memcpy(&v, bits + i * dst_byte_size, dst_byte_size);
- val->constant->values[i] =
- nir_const_value_for_uint(v, dst_bit_size);
- }
- }
- break;
- }
- case SpvOpVectorShuffle: { - case SpvOpVectorShuffle: {
- struct vtn_value *v0 = &b->values[w[4]]; - struct vtn_value *v0 = &b->values[w[4]];
- struct vtn_value *v1 = &b->values[w[5]]; - struct vtn_value *v1 = &b->values[w[5]];
@@ -172,39 +271,45 @@ index 6f87ff9..3684b32 100644
- } else { - } else {
- comp = vtn_value(b, w[5], vtn_value_type_constant); - comp = vtn_value(b, w[5], vtn_value_type_constant);
- deref_start = 6; - deref_start = 6;
- val->constant = nir_constant_clone(comp->constant, - val->constant = nir_constant_clone(comp->constant, b->shader);
- (nir_variable *)b);
- c = &val->constant; - c = &val->constant;
- } - }
- -
- int elem = -1; - int elem = -1;
- const struct vtn_type *type = comp->type; - const struct vtn_type *type = comp->type;
- for (unsigned i = deref_start; i < count; i++) { - for (unsigned i = deref_start; i < count; i++) {
- vtn_fail_if(w[i] > type->length, - if (type->base_type == vtn_base_type_cooperative_matrix) {
- "%uth index of %s is %u but the type has only " - /* Cooperative matrices are always scalar constants. We don't
- "%u elements", i - deref_start, - * care about the index w[i] because it's always replicated.
- spirv_op_to_string(opcode), w[i], type->length); - */
- type = type->component_type;
- } else {
- vtn_fail_if(w[i] > type->length,
- "%uth index of %s is %u but the type has only "
- "%u elements", i - deref_start,
- spirv_op_to_string(opcode), w[i], type->length);
- -
- switch (type->base_type) { - switch (type->base_type) {
- case vtn_base_type_vector: - case vtn_base_type_vector:
- elem = w[i]; - elem = w[i];
- type = type->array_element; - type = type->array_element;
- break; - break;
- -
- case vtn_base_type_matrix: - case vtn_base_type_matrix:
- case vtn_base_type_array: - case vtn_base_type_array:
- c = &(*c)->elements[w[i]]; - c = &(*c)->elements[w[i]];
- type = type->array_element; - type = type->array_element;
- break; - break;
- -
- case vtn_base_type_struct: - case vtn_base_type_struct:
- c = &(*c)->elements[w[i]]; - c = &(*c)->elements[w[i]];
- type = type->members[w[i]]; - type = type->members[w[i]];
- break; - break;
- -
- default: - default:
- vtn_fail("%s must only index into composite types", - vtn_fail("%s must only index into composite types",
- spirv_op_to_string(opcode)); - spirv_op_to_string(opcode));
- }
- } - }
- } - }
- -
@@ -233,10 +338,12 @@ index 6f87ff9..3684b32 100644
- -
- default: { - default: {
- bool swap; - bool swap;
- nir_alu_type dst_alu_type = nir_get_nir_type_for_glsl_type(val->type->type); -
- nir_alu_type src_alu_type = dst_alu_type; - const glsl_type *org_dst_type = val->type->type;
- const glsl_type *org_src_type = org_dst_type;
-
- const bool saturate = vtn_has_decoration(b, val, SpvDecorationSaturatedToLargestFloat8NormalConversionEXT);
- unsigned num_components = glsl_get_vector_elements(val->type->type); - unsigned num_components = glsl_get_vector_elements(val->type->type);
- unsigned bit_size;
- -
- vtn_assert(count <= 7); - vtn_assert(count <= 7);
- -
@@ -244,26 +351,31 @@ index 6f87ff9..3684b32 100644
- case SpvOpSConvert: - case SpvOpSConvert:
- case SpvOpFConvert: - case SpvOpFConvert:
- case SpvOpUConvert: - case SpvOpUConvert:
- /* We have a source in a conversion */ - /* We have a different source type in a conversion. */
- src_alu_type = - org_src_type = vtn_get_value_type(b, w[4])->type;
- nir_get_nir_type_for_glsl_type(vtn_get_value_type(b, w[4])->type);
- /* We use the bitsize of the conversion source to evaluate the opcode later */
- bit_size = glsl_get_bit_size(vtn_get_value_type(b, w[4])->type);
- break; - break;
- default: - default:
- bit_size = glsl_get_bit_size(val->type->type); - break;
- }; - };
- -
- const glsl_type *dst_type = org_dst_type;
- if (glsl_type_is_bfloat_16(dst_type) || glsl_type_is_e4m3fn(dst_type) || glsl_type_is_e5m2(dst_type))
- dst_type = glsl_float_type();
-
- const glsl_type *src_type = org_src_type;
- if (glsl_type_is_bfloat_16(src_type) || glsl_type_is_e4m3fn(src_type) || glsl_type_is_e5m2(src_type))
- src_type = glsl_float_type();
-
- bool exact; - bool exact;
- nir_op op = vtn_nir_alu_op_for_spirv_opcode(b, opcode, &swap, &exact, - nir_op op = vtn_nir_alu_op_for_spirv_opcode(b, opcode, &swap, &exact,
- nir_alu_type_get_type_size(src_alu_type), - src_type, dst_type);
- nir_alu_type_get_type_size(dst_alu_type));
- -
- /* No SPIR-V opcodes handled through this path should set exact. - /* No SPIR-V opcodes handled through this path should set exact.
- * Since it is ignored, assert on it. - * Since it is ignored, assert on it.
- */ - */
- assert(!exact); - assert(!exact);
- -
- unsigned bit_size = glsl_get_bit_size(dst_type);
- nir_const_value src[3][NIR_MAX_VEC_COMPONENTS]; - nir_const_value src[3][NIR_MAX_VEC_COMPONENTS];
- -
- for (unsigned i = 0; i < count - 4; i++) { - for (unsigned i = 0; i < count - 4; i++) {
@@ -273,16 +385,30 @@ index 6f87ff9..3684b32 100644
- /* If this is an unsized source, pull the bit size from the - /* If this is an unsized source, pull the bit size from the
- * source; otherwise, we'll use the bit size from the destination. - * source; otherwise, we'll use the bit size from the destination.
- */ - */
- if (!nir_alu_type_get_type_size(nir_op_infos[op].input_types[i])) - if (!nir_alu_type_get_type_size(nir_op_infos[op].input_types[i])) {
- bit_size = glsl_get_bit_size(src_val->type->type); - if (org_src_type != src_type) {
- /* Small float conversion. */
- assert(i == 0);
- bit_size = glsl_get_bit_size(src_type);
- } else {
- bit_size = glsl_get_bit_size(src_val->type->type);
- }
- }
- -
- unsigned src_comps = nir_op_infos[op].input_sizes[i] ? - unsigned src_comps = nir_op_infos[op].input_sizes[i] ?
- nir_op_infos[op].input_sizes[i] : - nir_op_infos[op].input_sizes[i] :
- num_components; - num_components;
- -
- unsigned j = swap ? 1 - i : i; - unsigned j = swap ? 1 - i : i;
- for (unsigned c = 0; c < src_comps; c++) - for (unsigned c = 0; c < src_comps; c++) {
- src[j][c] = src_val->constant->values[c]; - src[j][c] = src_val->constant->values[c];
- if (glsl_type_is_bfloat_16(org_src_type))
- src[j][c].f32 = _mesa_bfloat16_bits_to_float(src[j][c].u16);
- else if (glsl_type_is_e4m3fn(org_src_type))
- src[j][c].f32 = _mesa_e4m3fn_to_float(src[j][c].u8);
- else if (glsl_type_is_e5m2(org_src_type))
- src[j][c].f32 = _mesa_e5m2_to_float(src[j][c].u8);
- }
- } - }
- -
- /* fix up fixed size sources */ - /* fix up fixed size sources */
@@ -311,6 +437,28 @@ index 6f87ff9..3684b32 100644
- nir_eval_const_opcode(op, val->constant->values, - nir_eval_const_opcode(op, val->constant->values,
- num_components, bit_size, srcs, - num_components, bit_size, srcs,
- b->shader->info.float_controls_execution_mode); - b->shader->info.float_controls_execution_mode);
-
- for (int i = 0; i < num_components; i++) {
- uint16_t conv;
- if (glsl_type_is_bfloat_16(org_dst_type)) {
- conv = _mesa_float_to_bfloat16_bits_rte(val->constant->values[i].f32);
- } else if (glsl_type_is_e4m3fn(org_dst_type)) {
- if (saturate)
- conv = _mesa_float_to_e4m3fn_sat(val->constant->values[i].f32);
- else
- conv = _mesa_float_to_e4m3fn(val->constant->values[i].f32);
- } else if (glsl_type_is_e5m2(org_dst_type)) {
- if (saturate)
- conv = _mesa_float_to_e5m2_sat(val->constant->values[i].f32);
- else
- conv = _mesa_float_to_e5m2(val->constant->values[i].f32);
- } else {
- continue;
- }
-
- val->constant->values[i] = nir_const_value_for_raw_uint(conv, glsl_get_bit_size(org_dst_type));
- }
-
- break; - break;
- } /* default */ - } /* default */
- } - }
@@ -320,7 +468,7 @@ index 6f87ff9..3684b32 100644
case SpvOpConstantNull: case SpvOpConstantNull:
val->constant = vtn_null_constant(b, val->type); val->constant = vtn_null_constant(b, val->type);
val->is_null_constant = true; val->is_null_constant = true;
@@ -6393,6 +6183,93 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode, @@ -7018,6 +6710,93 @@ vtn_handle_body_instruction(struct vtn_builder *b, SpvOp opcode,
return true; return true;
} }
@@ -351,8 +499,8 @@ index 6f87ff9..3684b32 100644
+ val->value_type = vtn_value_type_ssa; + val->value_type = vtn_value_type_ssa;
+ val->ssa = vtn_create_ssa_value(b, val->type->type); + val->ssa = vtn_create_ssa_value(b, val->type->type);
+ +
+ nir_ssa_def *sc_imm = nir_imm_int(&b->nb, GODOT_NIR_SC_SENTINEL_MAGIC | val->sc_id); + nir_def *sc_imm = nir_imm_int(&b->nb, GODOT_NIR_SC_SENTINEL_MAGIC | val->sc_id);
+ nir_ssa_def *non_opt_const = nir_build_load_constant_non_opt(&b->nb, 1, 32, sc_imm); + nir_def *non_opt_const = nir_load_constant_non_opt(&b->nb, 1, 32, sc_imm);
+ +
+ vtn_assert(b->nb.cursor.option == nir_cursor_after_instr); + vtn_assert(b->nb.cursor.option == nir_cursor_after_instr);
+ vtn_assert(b->nb.cursor.instr->type == nir_instr_type_intrinsic); + vtn_assert(b->nb.cursor.instr->type == nir_instr_type_intrinsic);
@@ -414,7 +562,7 @@ index 6f87ff9..3684b32 100644
static bool static bool
is_glslang(const struct vtn_builder *b) is_glslang(const struct vtn_builder *b)
{ {
@@ -6632,6 +6509,8 @@ spirv_to_nir(const uint32_t *words, size_t word_count, @@ -7376,6 +7155,8 @@ spirv_to_nir(const uint32_t *words, size_t word_count,
/* Skip the SPIR-V header, handled at vtn_create_builder */ /* Skip the SPIR-V header, handled at vtn_create_builder */
words+= 5; words+= 5;
@@ -423,20 +571,20 @@ index 6f87ff9..3684b32 100644
/* Handle all the preamble instructions */ /* Handle all the preamble instructions */
words = vtn_foreach_instruction(b, words, word_end, words = vtn_foreach_instruction(b, words, word_end,
vtn_handle_preamble_instruction); vtn_handle_preamble_instruction);
@@ -6713,7 +6592,7 @@ spirv_to_nir(const uint32_t *words, size_t word_count, @@ -7461,7 +7242,7 @@ spirv_to_nir(const uint32_t *words, size_t word_count,
vtn_foreach_function(func, &b->functions) {
if ((options->create_library || func->referenced) && !func->emitted) { if ((options->create_library || func->referenced) && !func->emitted) {
b->const_table = _mesa_pointer_hash_table_create(b); _mesa_hash_table_clear(b->strings, NULL);
- vtn_function_emit(b, func, vtn_handle_body_instruction); - vtn_function_emit(b, func, vtn_handle_body_instruction);
+ vtn_function_emit(b, func, vtn_handle_spec_constant_instructions, preamble_words, vtn_handle_body_instruction); + vtn_function_emit(b, func, vtn_handle_spec_constant_instructions, preamble_words, vtn_handle_body_instruction);
progress = true; progress = true;
} }
} }
diff --git a/godot-mesa/src/compiler/spirv/vtn_cfg.c b/godot-mesa/src/compiler/spirv/vtn_cfg.c diff --git a/godot-mesa/src/compiler/spirv/vtn_cfg.c b/godot-mesa/src/compiler/spirv/vtn_cfg.c
index b02c11b..7d0c647 100644 index 83d3228..78aee17 100644
--- a/godot-mesa/src/compiler/spirv/vtn_cfg.c --- a/godot-mesa/src/compiler/spirv/vtn_cfg.c
+++ b/godot-mesa/src/compiler/spirv/vtn_cfg.c +++ b/godot-mesa/src/compiler/spirv/vtn_cfg.c
@@ -1425,6 +1425,8 @@ vtn_emit_cf_func_unstructured(struct vtn_builder *b, struct vtn_function *func, @@ -763,6 +763,8 @@ vtn_emit_cf_func_unstructured(struct vtn_builder *b, struct vtn_function *func,
void void
vtn_function_emit(struct vtn_builder *b, struct vtn_function *func, vtn_function_emit(struct vtn_builder *b, struct vtn_function *func,
@@ -445,7 +593,7 @@ index b02c11b..7d0c647 100644
vtn_instruction_handler instruction_handler) vtn_instruction_handler instruction_handler)
{ {
static int force_unstructured = -1; static int force_unstructured = -1;
@@ -1440,6 +1442,9 @@ vtn_function_emit(struct vtn_builder *b, struct vtn_function *func, @@ -777,6 +779,9 @@ vtn_function_emit(struct vtn_builder *b, struct vtn_function *func,
b->nb.exact = b->exact; b->nb.exact = b->exact;
b->phi_table = _mesa_pointer_hash_table_create(b); b->phi_table = _mesa_pointer_hash_table_create(b);
@@ -456,10 +604,10 @@ index b02c11b..7d0c647 100644
impl->structured = false; impl->structured = false;
vtn_emit_cf_func_unstructured(b, func, instruction_handler); vtn_emit_cf_func_unstructured(b, func, instruction_handler);
diff --git a/godot-mesa/src/compiler/spirv/vtn_private.h b/godot-mesa/src/compiler/spirv/vtn_private.h diff --git a/godot-mesa/src/compiler/spirv/vtn_private.h b/godot-mesa/src/compiler/spirv/vtn_private.h
index b1ec64d..1bdb3c8 100644 index 5d601f9..4ab1a22 100644
--- a/godot-mesa/src/compiler/spirv/vtn_private.h --- a/godot-mesa/src/compiler/spirv/vtn_private.h
+++ b/godot-mesa/src/compiler/spirv/vtn_private.h +++ b/godot-mesa/src/compiler/spirv/vtn_private.h
@@ -307,6 +307,8 @@ typedef bool (*vtn_instruction_handler)(struct vtn_builder *, SpvOp, @@ -243,6 +243,8 @@ typedef bool (*vtn_instruction_handler)(struct vtn_builder *, SpvOp,
void vtn_build_cfg(struct vtn_builder *b, const uint32_t *words, void vtn_build_cfg(struct vtn_builder *b, const uint32_t *words,
const uint32_t *end); const uint32_t *end);
void vtn_function_emit(struct vtn_builder *b, struct vtn_function *func, void vtn_function_emit(struct vtn_builder *b, struct vtn_function *func,
@@ -468,7 +616,7 @@ index b1ec64d..1bdb3c8 100644
vtn_instruction_handler instruction_handler); vtn_instruction_handler instruction_handler);
void vtn_handle_function_call(struct vtn_builder *b, SpvOp opcode, void vtn_handle_function_call(struct vtn_builder *b, SpvOp opcode,
const uint32_t *w, unsigned count); const uint32_t *w, unsigned count);
@@ -563,6 +565,8 @@ struct vtn_variable { @@ -521,6 +523,8 @@ struct vtn_variable {
unsigned descriptor_set; unsigned descriptor_set;
unsigned binding; unsigned binding;
bool explicit_binding; bool explicit_binding;
@@ -477,7 +625,7 @@ index b1ec64d..1bdb3c8 100644
unsigned offset; unsigned offset;
unsigned input_attachment_index; unsigned input_attachment_index;
@@ -633,6 +637,9 @@ struct vtn_value { @@ -594,6 +598,9 @@ struct vtn_value {
struct vtn_ssa_value *ssa; struct vtn_ssa_value *ssa;
vtn_instruction_handler ext_handler; vtn_instruction_handler ext_handler;
}; };
@@ -488,7 +636,7 @@ index b1ec64d..1bdb3c8 100644
#define VTN_DEC_DECORATION -1 #define VTN_DEC_DECORATION -1
diff --git a/godot-mesa/src/compiler/spirv/vtn_variables.c b/godot-mesa/src/compiler/spirv/vtn_variables.c diff --git a/godot-mesa/src/compiler/spirv/vtn_variables.c b/godot-mesa/src/compiler/spirv/vtn_variables.c
index 8db61c8..8545903 100644 index 55557e7..16866df 100644
--- a/godot-mesa/src/compiler/spirv/vtn_variables.c --- a/godot-mesa/src/compiler/spirv/vtn_variables.c
+++ b/godot-mesa/src/compiler/spirv/vtn_variables.c +++ b/godot-mesa/src/compiler/spirv/vtn_variables.c
@@ -26,6 +26,8 @@ @@ -26,6 +26,8 @@
@@ -500,7 +648,7 @@ index 8db61c8..8545903 100644
static struct vtn_pointer* static struct vtn_pointer*
vtn_align_pointer(struct vtn_builder *b, struct vtn_pointer *ptr, vtn_align_pointer(struct vtn_builder *b, struct vtn_pointer *ptr,
unsigned alignment) unsigned alignment)
@@ -1407,13 +1409,17 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member, @@ -1620,13 +1622,17 @@ var_decoration_cb(struct vtn_builder *b, struct vtn_value *val, int member,
/* Handle decorations that apply to a vtn_variable as a whole */ /* Handle decorations that apply to a vtn_variable as a whole */
switch (dec->decoration) { switch (dec->decoration) {
@@ -523,10 +671,10 @@ index 8db61c8..8545903 100644
vtn_var->input_attachment_index = dec->operands[0]; vtn_var->input_attachment_index = dec->operands[0];
vtn_var->access |= ACCESS_NON_WRITEABLE; vtn_var->access |= ACCESS_NON_WRITEABLE;
diff --git a/godot-mesa/src/microsoft/compiler/dxil_container.c b/godot-mesa/src/microsoft/compiler/dxil_container.c diff --git a/godot-mesa/src/microsoft/compiler/dxil_container.c b/godot-mesa/src/microsoft/compiler/dxil_container.c
index 2099734..487cda7 100644 index 77a14cd..24d8362 100644
--- a/godot-mesa/src/microsoft/compiler/dxil_container.c --- a/godot-mesa/src/microsoft/compiler/dxil_container.c
+++ b/godot-mesa/src/microsoft/compiler/dxil_container.c +++ b/godot-mesa/src/microsoft/compiler/dxil_container.c
@@ -338,7 +338,8 @@ dxil_container_add_state_validation(struct dxil_container *c, @@ -331,7 +331,8 @@ dxil_container_add_state_validation(struct dxil_container *c,
bool bool
dxil_container_add_module(struct dxil_container *c, dxil_container_add_module(struct dxil_container *c,
@@ -536,7 +684,7 @@ index 2099734..487cda7 100644
{ {
assert(m->buf.buf_bits == 0); // make sure the module is fully flushed assert(m->buf.buf_bits == 0); // make sure the module is fully flushed
uint32_t version = (m->shader_kind << 16) | uint32_t version = (m->shader_kind << 16) |
@@ -352,18 +353,22 @@ dxil_container_add_module(struct dxil_container *c, @@ -345,18 +346,22 @@ dxil_container_add_module(struct dxil_container *c,
uint32_t bitcode_offset = 16; uint32_t bitcode_offset = 16;
uint32_t bitcode_size = m->buf.blob.size; uint32_t bitcode_size = m->buf.blob.size;
@@ -563,7 +711,7 @@ index 2099734..487cda7 100644
{ {
assert(blob->size == 0); assert(blob->size == 0);
if (!blob_write_bytes(blob, &DXIL_DXBC, sizeof(DXIL_DXBC))) if (!blob_write_bytes(blob, &DXIL_DXBC, sizeof(DXIL_DXBC)))
@@ -394,8 +399,12 @@ dxil_container_write(struct dxil_container *c, struct blob *blob) @@ -387,8 +392,12 @@ dxil_container_write(struct dxil_container *c, struct blob *blob)
} }
if (!blob_write_bytes(blob, &c->num_parts, sizeof(c->num_parts)) || if (!blob_write_bytes(blob, &c->num_parts, sizeof(c->num_parts)) ||
@@ -579,7 +727,7 @@ index 2099734..487cda7 100644
return true; return true;
diff --git a/godot-mesa/src/microsoft/compiler/dxil_container.h b/godot-mesa/src/microsoft/compiler/dxil_container.h diff --git a/godot-mesa/src/microsoft/compiler/dxil_container.h b/godot-mesa/src/microsoft/compiler/dxil_container.h
index b3279ee..08ab970 100644 index 2c3f17c..3eb684f 100644
--- a/godot-mesa/src/microsoft/compiler/dxil_container.h --- a/godot-mesa/src/microsoft/compiler/dxil_container.h
+++ b/godot-mesa/src/microsoft/compiler/dxil_container.h +++ b/godot-mesa/src/microsoft/compiler/dxil_container.h
@@ -123,10 +123,11 @@ dxil_container_add_state_validation(struct dxil_container *c, @@ -123,10 +123,11 @@ dxil_container_add_state_validation(struct dxil_container *c,
@@ -597,7 +745,7 @@ index b3279ee..08ab970 100644
#ifdef __cplusplus #ifdef __cplusplus
} }
diff --git a/godot-mesa/src/microsoft/compiler/dxil_module.c b/godot-mesa/src/microsoft/compiler/dxil_module.c diff --git a/godot-mesa/src/microsoft/compiler/dxil_module.c b/godot-mesa/src/microsoft/compiler/dxil_module.c
index 773e564..57b6a62 100644 index c70c67c..0634b52 100644
--- a/godot-mesa/src/microsoft/compiler/dxil_module.c --- a/godot-mesa/src/microsoft/compiler/dxil_module.c
+++ b/godot-mesa/src/microsoft/compiler/dxil_module.c +++ b/godot-mesa/src/microsoft/compiler/dxil_module.c
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
@@ -609,7 +757,7 @@ index 773e564..57b6a62 100644
void void
dxil_module_init(struct dxil_module *m, void *ralloc_ctx) dxil_module_init(struct dxil_module *m, void *ralloc_ctx)
{ {
@@ -2630,6 +2632,12 @@ emit_consts(struct dxil_module *m) @@ -2669,6 +2671,12 @@ emit_consts(struct dxil_module *m)
continue; continue;
} }
@@ -623,7 +771,7 @@ index 773e564..57b6a62 100644
case TYPE_INTEGER: case TYPE_INTEGER:
if (!emit_int_value(m, c->int_value)) if (!emit_int_value(m, c->int_value))
diff --git a/godot-mesa/src/microsoft/compiler/dxil_module.h b/godot-mesa/src/microsoft/compiler/dxil_module.h diff --git a/godot-mesa/src/microsoft/compiler/dxil_module.h b/godot-mesa/src/microsoft/compiler/dxil_module.h
index ca170c5..7fab628 100644 index 08ba263..d4c412d 100644
--- a/godot-mesa/src/microsoft/compiler/dxil_module.h --- a/godot-mesa/src/microsoft/compiler/dxil_module.h
+++ b/godot-mesa/src/microsoft/compiler/dxil_module.h +++ b/godot-mesa/src/microsoft/compiler/dxil_module.h
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
@@ -635,7 +783,7 @@ index ca170c5..7fab628 100644
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -247,6 +249,8 @@ struct dxil_module { @@ -268,6 +270,8 @@ struct dxil_module {
struct rb_tree *functions; struct rb_tree *functions;
struct dxil_func_def *cur_emitting_func; struct dxil_func_def *cur_emitting_func;
@@ -645,10 +793,10 @@ index ca170c5..7fab628 100644
struct dxil_instr; struct dxil_instr;
diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
index c4de9dd..3c0223f 100644 index f99cf69..fa5bec7 100644
--- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c --- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
+++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c +++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.c
@@ -43,6 +43,8 @@ @@ -44,6 +44,8 @@
#include <stdint.h> #include <stdint.h>
@@ -657,7 +805,7 @@ index c4de9dd..3c0223f 100644
int debug_dxil = 0; int debug_dxil = 0;
static const struct debug_named_value static const struct debug_named_value
@@ -1154,6 +1156,8 @@ add_resource(struct ntd_context *ctx, enum dxil_resource_type type, @@ -1226,6 +1228,8 @@ add_resource(struct ntd_context *ctx, enum dxil_resource_type type,
/* No flags supported yet */ /* No flags supported yet */
resource_v1->resource_flags = 0; resource_v1->resource_flags = 0;
} }
@@ -666,20 +814,20 @@ index c4de9dd..3c0223f 100644
} }
static const struct dxil_value * static const struct dxil_value *
@@ -5091,6 +5095,12 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr) @@ -4963,6 +4967,12 @@ emit_intrinsic(struct ntd_context *ctx, nir_intrinsic_instr *intr)
case nir_intrinsic_exclusive_scan: return emit_load_unary_external_function(ctx, intr, "dx.op.startInstanceLocation",
return emit_reduce(ctx, intr); DXIL_INTR_START_INSTANCE_LOCATION, nir_type_int);
+ case nir_intrinsic_load_constant_non_opt: { + case nir_intrinsic_load_constant_non_opt: {
+ const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint); + const struct dxil_value* value = get_src(ctx, &intr->src[0], 0, nir_type_uint);
+ store_dest_value(ctx, &intr->dest, 0, value); + store_def(ctx, &intr->def, 0, value);
+ return true; + return true;
+ } + }
+ +
case nir_intrinsic_load_num_workgroups: case nir_intrinsic_load_num_workgroups:
case nir_intrinsic_load_workgroup_size: case nir_intrinsic_load_workgroup_size:
default: default:
@@ -6656,6 +6666,7 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts, @@ -6618,6 +6628,7 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
MIN2(opts->shader_model_max & 0xffff, validator_version & 0xffff); MIN2(opts->shader_model_max & 0xffff, validator_version & 0xffff);
ctx->mod.major_validator = validator_version >> 16; ctx->mod.major_validator = validator_version >> 16;
ctx->mod.minor_validator = validator_version & 0xffff; ctx->mod.minor_validator = validator_version & 0xffff;
@@ -687,7 +835,7 @@ index c4de9dd..3c0223f 100644
if (s->info.stage <= MESA_SHADER_FRAGMENT) { if (s->info.stage <= MESA_SHADER_FRAGMENT) {
uint64_t in_mask = uint64_t in_mask =
@@ -6774,19 +6785,23 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts, @@ -6773,19 +6784,23 @@ nir_to_dxil(struct nir_shader *s, const struct nir_to_dxil_options *opts,
goto out; goto out;
} }
@@ -714,7 +862,7 @@ index c4de9dd..3c0223f 100644
static int shader_id = 0; static int shader_id = 0;
char buffer[64]; char buffer[64];
diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.h b/godot-mesa/src/microsoft/compiler/nir_to_dxil.h diff --git a/godot-mesa/src/microsoft/compiler/nir_to_dxil.h b/godot-mesa/src/microsoft/compiler/nir_to_dxil.h
index bdfbe23..b95ca1d 100644 index 9890115..abe9e9d 100644
--- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.h --- a/godot-mesa/src/microsoft/compiler/nir_to_dxil.h
+++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.h +++ b/godot-mesa/src/microsoft/compiler/nir_to_dxil.h
@@ -29,6 +29,8 @@ @@ -29,6 +29,8 @@
@@ -735,13 +883,13 @@ index bdfbe23..b95ca1d 100644
typedef void (*dxil_msg_callback)(void *priv, const char *msg); typedef void (*dxil_msg_callback)(void *priv, const char *msg);
diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c b/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
index 43de965..8965ecc 100644 index 66a996e..4d8eff1 100644
--- a/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c --- a/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
+++ b/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c +++ b/godot-mesa/src/microsoft/spirv_to_dxil/dxil_spirv_nir.c
@@ -1068,28 +1068,7 @@ dxil_spirv_nir_passes(nir_shader *nir, @@ -1058,30 +1058,7 @@ dxil_spirv_nir_passes(nir_shader *nir,
NIR_PASS_V(nir, nir_lower_alu_to_scalar, NULL, NULL); NIR_PASS(_, nir, nir_lower_alu_to_scalar, NULL, NULL);
NIR_PASS_V(nir, nir_opt_dce); NIR_PASS(_, nir, nir_opt_dce);
NIR_PASS_V(nir, dxil_nir_lower_double_math); NIR_PASS(_, nir, dxil_nir_lower_double_math);
- -
- { - {
- bool progress; - bool progress;
@@ -755,21 +903,23 @@ index 43de965..8965ecc 100644
- NIR_PASS(progress, nir, nir_opt_undef); - NIR_PASS(progress, nir, nir_opt_undef);
- NIR_PASS(progress, nir, nir_opt_constant_folding); - NIR_PASS(progress, nir, nir_opt_constant_folding);
- NIR_PASS(progress, nir, nir_opt_cse); - NIR_PASS(progress, nir, nir_opt_cse);
- if (nir_opt_trivial_continues(nir)) { - if (nir_opt_loop(nir)) {
- progress = true; - progress = true;
- NIR_PASS(progress, nir, nir_copy_prop); - NIR_PASS(progress, nir, nir_copy_prop);
- NIR_PASS(progress, nir, nir_opt_dce); - NIR_PASS(progress, nir, nir_opt_dce);
- } - }
- NIR_PASS(progress, nir, nir_lower_vars_to_ssa); - NIR_PASS(progress, nir, nir_lower_vars_to_ssa);
- NIR_PASS(progress, nir, nir_opt_algebraic); - NIR_PASS(progress, nir, nir_opt_algebraic);
- NIR_PASS(progress, nir, nir_opt_dead_cf);
- NIR_PASS(progress, nir, nir_opt_remove_phis);
- } while (progress); - } while (progress);
- } - }
+ NIR_PASS_V(nir, nir_lower_vars_to_ssa); + NIR_PASS(_, nir, nir_lower_vars_to_ssa);
if (conf->declared_read_only_images_as_srvs) NIR_PASS(_, nir, nir_remove_dead_variables, nir_var_function_temp, NULL);
NIR_PASS_V(nir, nir_lower_readonly_images_to_tex, true); NIR_PASS(_, nir, nir_split_struct_vars, nir_var_function_temp);
diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
index 76cf6b0..819339a 100644 index 1a8e6e2..1b3b9d3 100644
--- a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c --- a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
+++ b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c +++ b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.c
@@ -32,6 +32,8 @@ @@ -32,6 +32,8 @@
@@ -778,9 +928,9 @@ index 76cf6b0..819339a 100644
+#include "drivers/d3d12/d3d12_godot_nir_bridge.h" +#include "drivers/d3d12/d3d12_godot_nir_bridge.h"
+ +
static_assert(DXIL_SPIRV_SHADER_NONE == (int)MESA_SHADER_NONE, "must match"); static_assert((mesa_shader_stage)DXIL_SPIRV_SHADER_NONE == MESA_SHADER_NONE, "must match");
static_assert(DXIL_SPIRV_SHADER_VERTEX == (int)MESA_SHADER_VERTEX, "must match"); static_assert((mesa_shader_stage)DXIL_SPIRV_SHADER_VERTEX == MESA_SHADER_VERTEX, "must match");
static_assert(DXIL_SPIRV_SHADER_TESS_CTRL == (int)MESA_SHADER_TESS_CTRL, "must match"); static_assert((mesa_shader_stage)DXIL_SPIRV_SHADER_TESS_CTRL == MESA_SHADER_TESS_CTRL, "must match");
@@ -50,6 +52,7 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, @@ -50,6 +52,7 @@ spirv_to_dxil(const uint32_t *words, size_t word_count,
const struct dxil_spirv_debug_options *dgb_opts, const struct dxil_spirv_debug_options *dgb_opts,
const struct dxil_spirv_runtime_conf *conf, const struct dxil_spirv_runtime_conf *conf,
@@ -798,7 +948,7 @@ index 76cf6b0..819339a 100644
const struct spirv_to_nir_options *spirv_opts = dxil_spirv_nir_get_spirv_options(); const struct spirv_to_nir_options *spirv_opts = dxil_spirv_nir_get_spirv_options();
diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h diff --git a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
index 40adf76..30efbd1 100644 index 00b1884..0d10644 100644
--- a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h --- a/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
+++ b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h +++ b/godot-mesa/src/microsoft/spirv_to_dxil/spirv_to_dxil.h
@@ -30,6 +30,8 @@ @@ -30,6 +30,8 @@
@@ -810,7 +960,7 @@ index 40adf76..30efbd1 100644
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
@@ -215,6 +217,7 @@ spirv_to_dxil(const uint32_t *words, size_t word_count, @@ -234,6 +236,7 @@ spirv_to_dxil(const uint32_t *words, size_t word_count,
const struct dxil_spirv_debug_options *debug_options, const struct dxil_spirv_debug_options *debug_options,
const struct dxil_spirv_runtime_conf *conf, const struct dxil_spirv_runtime_conf *conf,
const struct dxil_spirv_logger *logger, const struct dxil_spirv_logger *logger,
@@ -818,3 +968,37 @@ index 40adf76..30efbd1 100644
struct dxil_spirv_object *out_dxil); struct dxil_spirv_object *out_dxil);
/** /**
diff --git a/godot-mesa/src/util/macros.h b/godot-mesa/src/util/macros.h
index 0070067..72410ef 100644
--- a/godot-mesa/src/util/macros.h
+++ b/godot-mesa/src/util/macros.h
@@ -543,14 +543,14 @@ typedef int lock_cap_t;
* SWAP - swap value of @a and @b
*/
#if !defined(_MSC_VER) || _MSC_VER >= 1939 /* MSVC 17.9 or later for __typeof__ */
-#define SWAP(a, b) \
+#define MESA_SWAP(a, b) \
do { \
__typeof__(a) __tmp = (a); \
(a) = (b); \
(b) = __tmp; \
} while (0)
#else
-#define SWAP(a, b) \
+#define MESA_SWAP(a, b) \
do { \
/* NOLINTBEGIN(bugprone-sizeof-expression) */ \
char __tmp[sizeof(a) == sizeof(b) ? (ptrdiff_t)sizeof(a) : -1]; \
diff --git a/godot-mesa/src/util/set.c b/godot-mesa/src/util/set.c
index d6c0623..1eac1e8 100644
--- a/godot-mesa/src/util/set.c
+++ b/godot-mesa/src/util/set.c
@@ -691,7 +691,7 @@ _mesa_set_intersects(struct set *a, struct set *b)
/* iterate over the set with less entries */
if (b->entries < a->entries) {
- SWAP(a, b);
+ MESA_SWAP(a, b);
}
set_foreach(a, entry) {

2
mesa

Submodule mesa updated: 52ab5584b8...5005a50879

40
update_mesa.sh
View File

@@ -36,7 +36,7 @@ run_custom_steps_at_source() {
} }
run_step bin 'git_sha1_gen.py --output $OUTDIR/git_sha1.h' run_step bin 'git_sha1_gen.py --output $OUTDIR/git_sha1.h'
run_step src/compiler/spirv 'spirv_info_c.py spirv.core.grammar.json $OUTDIR/spirv_info.c' run_step src/compiler/spirv 'spirv_info_gen.py --json spirv.core.grammar.json --out-h $OUTDIR/spirv_info.h --out-c $OUTDIR/spirv_info.c'
run_step src/compiler/spirv 'vtn_gather_types_c.py spirv.core.grammar.json $OUTDIR/vtn_gather_types.c' run_step src/compiler/spirv 'vtn_gather_types_c.py spirv.core.grammar.json $OUTDIR/vtn_gather_types.c'
} }
@@ -49,6 +49,9 @@ copy_file() {
} }
copy_custom_steps_sources() { copy_custom_steps_sources() {
copy_file src/compiler builtin_types.py
copy_file src/compiler builtin_types_h.py
copy_file src/compiler builtin_types_c.py
copy_file src/compiler/glsl ir_expression_operation.py copy_file src/compiler/glsl ir_expression_operation.py
copy_file src/compiler/nir nir_builder_opcodes_h.py copy_file src/compiler/nir nir_builder_opcodes_h.py
copy_file src/compiler/nir nir_constant_expressions.py copy_file src/compiler/nir nir_constant_expressions.py
@@ -65,7 +68,7 @@ copy_custom_steps_sources() {
copy_file src/compiler/spirv vtn_generator_ids_h.py copy_file src/compiler/spirv vtn_generator_ids_h.py
copy_file src/microsoft/compiler dxil_nir_algebraic.py copy_file src/microsoft/compiler dxil_nir_algebraic.py
copy_file src/util format_srgb.py copy_file src/util format_srgb.py
copy_file src/util/format u_format.csv copy_file src/util/format u_format.yaml
copy_file src/util/format u_format_pack.py copy_file src/util/format u_format_pack.py
copy_file src/util/format u_format_parse.py copy_file src/util/format u_format_parse.py
copy_file src/util/format u_format_table.py copy_file src/util/format u_format_table.py
@@ -126,34 +129,52 @@ copy_sources() {
copy_file src/util blob.c copy_file src/util blob.c
copy_file src/util bitscan.c copy_file src/util bitscan.c
copy_file src/util double.c copy_file src/util double.c
copy_file src/util float8.c
copy_file src/util half_float.c copy_file src/util half_float.c
copy_file src/util hash_table.c copy_file src/util hash_table.c
copy_file src/util log.c copy_file src/util log.c
copy_file src/util mesa-blake3.c
copy_file src/util mesa-sha1.c copy_file src/util mesa-sha1.c
copy_file src/util memstream.c copy_file src/util memstream.c
copy_file src/util os_misc.c copy_file src/util os_misc.c
copy_file src/util ralloc.c copy_file src/util ralloc.c
copy_file src/util range_minimum_query.c
copy_file src/util rb_tree.c copy_file src/util rb_tree.c
copy_file src/util rgtc.c copy_file src/util rgtc.c
copy_file src/util set.c copy_file src/util set.c
copy_file src/util simple_mtx.c copy_file src/util simple_mtx.c
copy_file src/util softfloat.c copy_file src/util softfloat.c
copy_file src/util string_buffer.c copy_file src/util string_buffer.c
copy_file src/util strndup.c
copy_file src/util u_call_once.c copy_file src/util u_call_once.c
copy_file src/util u_cpu_detect.c
copy_file src/util u_debug.c copy_file src/util u_debug.c
copy_file src/util u_dynarray.c
copy_file src/util u_printf.c copy_file src/util u_printf.c
copy_file src/util u_qsort.cpp copy_file src/util u_qsort.cpp
copy_file src/util u_thread.c
copy_file src/util u_vector.c copy_file src/util u_vector.c
copy_file src/util u_worklist.c copy_file src/util u_worklist.c
copy_subir_headers src/util/blake3
copy_file src/util/blake3 blake3.c
copy_file src/util/blake3 blake3_dispatch.c
copy_file src/util/blake3 blake3_portable.c
copy_subir_headers src/util/perf
cp ./mesa/VERSION godot-mesa/VERSION.info cp ./mesa/VERSION godot-mesa/VERSION.info
check_error check_error
} }
blacklist_sources() { blacklist_sources() {
rm godot-mesa/src/compiler/nir/nir_stub.c
check_error
# These are programs. Not needed and makes build hungrier for dependencies. # These are programs. Not needed and makes build hungrier for dependencies.
rm godot-mesa/src/compiler/spirv/spirv2nir.c rm godot-mesa/src/compiler/spirv/spirv2nir.c
check_error check_error
rm godot-mesa/src/compiler/spirv/vtn_bindgen2.c
check_error
rm godot-mesa/src/microsoft/compiler/dxil_buffer_test.c
check_error
rm godot-mesa/src/microsoft/spirv_to_dxil/spirv2dxil.c rm godot-mesa/src/microsoft/spirv_to_dxil/spirv2dxil.c
check_error check_error
} }
@@ -195,17 +216,20 @@ custom_source_gen() {
run_step 'src/compiler' 'glsl/ir_expression_operation.py enum' 'ir_expression_operation.h' run_step 'src/compiler' 'glsl/ir_expression_operation.py enum' 'ir_expression_operation.h'
run_step 'src/compiler/nir' 'nir_builder_opcodes_h.py' 'nir_builder_opcodes.h' run_step 'src/compiler/nir' 'nir_builder_opcodes_h.py' 'nir_builder_opcodes.h'
run_step 'src/compiler/nir' 'nir_constant_expressions.py' 'nir_constant_expressions.c' run_step 'src/compiler/nir' 'nir_constant_expressions.py' 'nir_constant_expressions.c'
run_step 'src/compiler/nir' 'nir_intrinsics_h.py --outdir $GENDIR' run_step 'src/compiler/nir' 'nir_intrinsics_h.py --out $GENDIR/nir_intrinsics.h'
run_step 'src/compiler/nir' 'nir_intrinsics_c.py --outdir $GENDIR' run_step 'src/compiler/nir' 'nir_intrinsics_c.py --out $GENDIR/nir_intrinsics.c'
run_step 'src/compiler/nir' 'nir_intrinsics_indices_h.py --outdir $GENDIR' run_step 'src/compiler/nir' 'nir_intrinsics_indices_h.py --out $GENDIR/nir_intrinsics_indices.h'
run_step 'src/compiler/nir' 'nir_opcodes_h.py' 'nir_opcodes.h' run_step 'src/compiler/nir' 'nir_opcodes_h.py' 'nir_opcodes.h'
run_step 'src/compiler/nir' 'nir_opcodes_c.py' 'nir_opcodes.c' run_step 'src/compiler/nir' 'nir_opcodes_c.py' 'nir_opcodes.c'
run_step 'src/compiler/nir' 'nir_opt_algebraic.py' 'nir_opt_algebraic.c' run_step 'src/compiler/nir' 'nir_opt_algebraic.py --out $GENDIR/nir_opt_algebraic.c'
run_step 'src/compiler/spirv' 'vtn_generator_ids_h.py spir-v.xml $GENDIR/vtn_generator_ids.h' run_step 'src/compiler/spirv' 'vtn_generator_ids_h.py spir-v.xml $GENDIR/vtn_generator_ids.h'
run_step 'src/microsoft/compiler' 'dxil_nir_algebraic.py -p ../../../src/compiler/nir' 'dxil_nir_algebraic.c' run_step 'src/microsoft/compiler' 'dxil_nir_algebraic.py -p ../../../src/compiler/nir' 'dxil_nir_algebraic.c'
run_step 'src/util' 'format_srgb.py' 'format_srgb.c' run_step 'src/util' 'format_srgb.py' 'format_srgb.c'
run_step 'src/util/format' 'u_format_table.py u_format.csv --header' 'u_format_pack.h' run_step 'src/util/format' 'u_format_table.py u_format.yaml --enums' 'u_format_gen.h'
run_step 'src/util/format' 'u_format_table.py u_format.csv' 'u_format_table.c' run_step 'src/util/format' 'u_format_table.py u_format.yaml --header' 'u_format_pack.h'
run_step 'src/util/format' 'u_format_table.py u_format.yaml' 'u_format_table.c'
run_step 'src/compiler' 'builtin_types_h.py $GENDIR/builtin_types.h'
run_step 'src/compiler' 'builtin_types_c.py $GENDIR/builtin_types.c'
} }