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

zink: incrementally hash vertex state into pipeline hash

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12605>
This commit is contained in:
Mike Blumenkrantz 2021-06-17 11:32:01 -04:00 • committed by Marge Bot
parent 6fd5565933
commit 12cf0099fd
4 changed files with 25 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/gallium/drivers/zink/zink_pipeline.h
View file

@ -68,6 +68,7 @@ struct zink_gfx_pipeline_state {
bool combined_dirty;
struct zink_vertex_elements_hw_state *element_state;
uint32_t vertex_hash;
uint32_t final_hash;

41
src/gallium/drivers/zink/zink_program.c
View file

@ -799,30 +799,33 @@ zink_get_gfx_pipeline(struct zink_context *ctx,
state->dirty = false;
}
if (state->combined_dirty) {
if (!have_EXT_vertex_input_dynamic_state)
ctx->vertex_state_changed = true;
state->combined_hash = XXH32(&state->module_hash, sizeof(uint32_t), state->hash);
state->combined_dirty = false;
if (have_EXT_vertex_input_dynamic_state)
state->final_hash = state->combined_hash;
else
ctx->vertex_state_changed = true;
}
if (have_EXT_vertex_input_dynamic_state)
state->final_hash = state->combined_hash;
else
if (ctx->vertex_state_changed) {
uint32_t hash = state->combined_hash;
if (!have_EXT_extended_dynamic_state) {
/* if we don't have dynamic states, we have to hash the enabled vertex buffer bindings */
uint32_t vertex_buffers_enabled_mask = state->vertex_buffers_enabled_mask;
hash = XXH32(&vertex_buffers_enabled_mask, sizeof(uint32_t), hash);
if (!have_EXT_vertex_input_dynamic_state && ctx->vertex_state_changed) {
if (state->pipeline)
state->final_hash ^= state->vertex_hash;
if (!have_EXT_extended_dynamic_state) {
uint32_t hash = 0;
/* if we don't have dynamic states, we have to hash the enabled vertex buffer bindings */
uint32_t vertex_buffers_enabled_mask = state->vertex_buffers_enabled_mask;
hash = XXH32(&vertex_buffers_enabled_mask, sizeof(uint32_t), hash);
for (unsigned i = 0; i < state->element_state->num_bindings; i++) {
struct pipe_vertex_buffer *vb = ctx->vertex_buffers + ctx->element_state->binding_map[i];
state->vertex_strides[i] = vb->buffer.resource ? vb->stride : 0;
hash = XXH32(&state->vertex_strides[i], sizeof(uint32_t), hash);
}
for (unsigned i = 0; i < state->element_state->num_bindings; i++) {
struct pipe_vertex_buffer *vb = ctx->vertex_buffers + ctx->element_state->binding_map[i];
state->vertex_strides[i] = vb->buffer.resource ? vb->stride : 0;
hash = XXH32(&state->vertex_strides[i], sizeof(uint32_t), hash);
}
state->final_hash = XXH32(&state->element_state, sizeof(void*), hash);
ctx->vertex_state_changed = false;
}
state->vertex_hash = hash ^ state->element_state->hash;
} else
state->vertex_hash = state->element_state->hash;
state->final_hash = state->combined_hash ^ state->vertex_hash;
}
ctx->vertex_state_changed = false;
entry = _mesa_hash_table_search_pre_hashed(prog->pipelines[idx], state->final_hash, state);
if (!entry) {

1
src/gallium/drivers/zink/zink_state.c
View file

@ -42,6 +42,7 @@ zink_create_vertex_elements_state(struct pipe_context *pctx,
struct zink_vertex_elements_state *ves = CALLOC_STRUCT(zink_vertex_elements_state);
if (!ves)
return NULL;
ves->hw_state.hash = _mesa_hash_pointer(ves);
int buffer_map[PIPE_MAX_ATTRIBS];
for (int i = 0; i < ARRAY_SIZE(buffer_map); ++i)

1
src/gallium/drivers/zink/zink_state.h
View file

@ -29,6 +29,7 @@
#include "pipe/p_state.h"
struct zink_vertex_elements_hw_state {
uint32_t hash;
union {
VkVertexInputAttributeDescription attribs[PIPE_MAX_ATTRIBS];
VkVertexInputAttributeDescription2EXT dynattribs[PIPE_MAX_ATTRIBS];