fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 00:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

dzn: Caculate a binding translation hash

Browse source 
Binding translation has an impact on the final DXIL shader, and this
binding translation depends on the pipeline layout. Let's extend the
adjust_var_bindings() pass to caculate a hash we can then use in the
DXIL shader hash caculation.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17140>
This commit is contained in:
Boris Brezillon 2022-06-22 09:46:49 +02:00 • committed by Marge Bot
parent 276c73580d
commit 52e2ca084a
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/microsoft/vulkan/dzn_pipeline.c
View file

@ -302,9 +302,14 @@ adjust_resource_index_binding(struct nir_builder *builder, nir_instr *instr,
static bool
adjust_var_bindings(nir_shader *shader,
const struct dzn_pipeline_layout *layout)
const struct dzn_pipeline_layout *layout,
uint8_t *bindings_hash)
{
uint32_t modes = nir_var_image | nir_var_uniform | nir_var_mem_ubo | nir_var_mem_ssbo;
struct mesa_sha1 bindings_hash_ctx;
if (bindings_hash)
_mesa_sha1_init(&bindings_hash_ctx);
nir_foreach_variable_with_modes(var, shader, modes) {
if (var->data.mode == nir_var_uniform) {
@ -321,8 +326,17 @@ adjust_var_bindings(nir_shader *shader,
assert(b < layout->binding_translation[s].binding_count);
var->data.binding = layout->binding_translation[s].base_reg[b];
if (bindings_hash) {
_mesa_sha1_update(&bindings_hash_ctx, &s, sizeof(s));
_mesa_sha1_update(&bindings_hash_ctx, &b, sizeof(b));
_mesa_sha1_update(&bindings_hash_ctx, &var->data.binding, sizeof(var->data.binding));
}
}
if (bindings_hash)
_mesa_sha1_final(&bindings_hash_ctx, bindings_hash);
return nir_shader_instructions_pass(shader, adjust_resource_index_binding,
nir_metadata_all, (void *)layout);
}
@ -565,7 +579,7 @@ dzn_graphics_pipeline_compile_shaders(struct dzn_device *device,
}
u_foreach_bit(stage, active_stage_mask) {
NIR_PASS_V(pipeline->templates.shaders[stage].nir, adjust_var_bindings, layout);
NIR_PASS_V(pipeline->templates.shaders[stage].nir, adjust_var_bindings, layout, NULL);
}
if (pipeline->templates.shaders[MESA_SHADER_VERTEX].nir) {
@ -1733,7 +1747,7 @@ dzn_compute_pipeline_compile_shader(struct dzn_device *device,
if (ret != VK_SUCCESS)
return ret;
NIR_PASS_V(nir, adjust_var_bindings, layout);
NIR_PASS_V(nir, adjust_var_bindings, layout, NULL);
ret = dzn_pipeline_compile_shader(device, nir, shader);
if (ret != VK_SUCCESS)