OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dozen: Use nir_test_mask instead of i2b(iand)

Browse Source 
Signed-off-by: Konstantin Seurer <konstantin.seurer@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Jason Ekstrand <jason.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17242>
This commit is contained in:
Konstantin Seurer
2022-06-24 21:45:52 +02:00
committed by Marge Bot
parent 39abd90d9e
commit 9fc7d5e0e1
1 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/microsoft/vulkan/dzn_nir.c
View File

@@ -411,10 +411,9 @@ dzn_nir_triangle_fan_prim_restart_rewrite_index_shader(uint8_t old_index_size)
old_index_size == 2 ? nir_iand_imm(&b, old_index_offset, ~3ULL) : old_index_offset, old_index_size == 2 ? nir_iand_imm(&b, old_index_offset, ~3ULL) : old_index_offset,
.align_mul = 4); .align_mul = 4);
if (old_index_size == 2) { if (old_index_size == 2) {
index_val = nir_bcsel(&b, index_val = nir_bcsel(&b, nir_test_mask(&b, old_index_offset, 0x2),
nir_ieq_imm(&b, nir_iand_imm(&b, old_index_offset, 0x2), 0), nir_ushr_imm(&b, index_val, 16),
nir_iand_imm(&b, index_val, 0xffff), nir_iand_imm(&b, index_val, 0xffff));
nir_ushr_imm(&b, index_val, 16));
} }
nir_store_var(&b, index0_var, index_val, 1); nir_store_var(&b, index0_var, index_val, 1);
@@ -433,11 +432,9 @@ dzn_nir_triangle_fan_prim_restart_rewrite_index_shader(uint8_t old_index_size)
nir_iand_imm(&b, nir_channel(&b, index12, 1), 0xffff), nir_iand_imm(&b, nir_channel(&b, index12, 1), 0xffff),
}; };
index12 = index12 = nir_bcsel(&b, nir_test_mask(&b, old_index_offset, 0x2),
nir_bcsel(&b, nir_vec2(&b, indices[1], indices[2]),
nir_ieq_imm(&b, nir_iand_imm(&b, old_index_offset, 0x2), 0), nir_vec2(&b, indices[0], indices[1]));
nir_vec2(&b, indices[0], indices[1]),
nir_vec2(&b, indices[1], indices[2]));
} }
nir_push_if(&b, nir_ieq(&b, nir_channel(&b, index12, 1), prim_restart_val)); nir_push_if(&b, nir_ieq(&b, nir_channel(&b, index12, 1), prim_restart_val));
@@ -516,11 +513,9 @@ dzn_nir_triangle_fan_rewrite_index_shader(uint8_t old_index_size)
.align_mul = 4); .align_mul = 4);
if (old_index_size == 2) { if (old_index_size == 2) {
old_index0 = old_index0 = nir_bcsel(&b, nir_test_mask(&b, old_index0_offset, 0x2),
nir_bcsel(&b, nir_ushr_imm(&b, old_index0, 16),
nir_ieq_imm(&b, nir_iand_imm(&b, old_index0_offset, 0x2), 0), nir_iand_imm(&b, old_index0, 0xffff));
nir_iand_imm(&b, old_index0, 0xffff),
nir_ushr_imm(&b, old_index0, 16));
} }
nir_ssa_def *old_index12 = nir_ssa_def *old_index12 =
@@ -534,11 +529,9 @@ dzn_nir_triangle_fan_rewrite_index_shader(uint8_t old_index_size)
nir_iand_imm(&b, nir_channel(&b, old_index12, 1), 0xffff), nir_iand_imm(&b, nir_channel(&b, old_index12, 1), 0xffff),
}; };
old_index12 = old_index12 = nir_bcsel(&b, nir_test_mask(&b, old_index1_offset, 0x2),
nir_bcsel(&b, nir_vec2(&b, indices[1], indices[2]),
nir_ieq_imm(&b, nir_iand_imm(&b, old_index1_offset, 0x2), 0), nir_vec2(&b, indices[0], indices[1]));
nir_vec2(&b, indices[0], indices[1]),
nir_vec2(&b, indices[1], indices[2]));
} }
/* TODO: VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT */ /* TODO: VK_PROVOKING_VERTEX_MODE_LAST_VERTEX_EXT */