fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-24 13:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

d3d12: Use context-level sampler_state array for filling shader keys

Browse source 
This significantly reduces the size of d3d12_shader_key

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21909>
This commit is contained in:
Giancarlo Devich 2023-03-14 11:38:53 -07:00 • committed by Marge Bot
parent 7854f9283c
commit 32e058017d
3 changed files with 18 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/gallium/drivers/d3d12/d3d12_compiler.cpp
View file

@ -97,6 +97,13 @@ compile_nir(struct d3d12_context *ctx, struct d3d12_shader_selector *sel,
struct d3d12_shader *shader = rzalloc(sel, d3d12_shader);
shader->key = *key;
if (shader->key.n_texture_states > 0) {
shader->key.tex_wrap_states = (dxil_wrap_sampler_state*)ralloc_size(sel, sizeof(dxil_wrap_sampler_state) * shader->key.n_texture_states);
memcpy(shader->key.tex_wrap_states, key->tex_wrap_states, sizeof(dxil_wrap_sampler_state) * shader->key.n_texture_states);
}
else
shader->key.tex_wrap_states = nullptr;
shader->output_vars_fs = nullptr;
shader->output_vars_gs = nullptr;
shader->output_vars_default = nullptr;
@ -837,7 +844,8 @@ d3d12_compare_shader_keys(struct d3d12_selection_context* sel_ctx, const d3d12_s
if (expect->n_images != have->n_images)
return false;
if (memcmp(expect->tex_wrap_states, have->tex_wrap_states,
if (expect->n_texture_states > 0 &&
memcmp(expect->tex_wrap_states, have->tex_wrap_states,
expect->n_texture_states * sizeof(dxil_wrap_sampler_state)))
return false;
@ -949,6 +957,7 @@ d3d12_fill_shader_key(struct d3d12_selection_context *sel_ctx,
}
key->n_texture_states = 0;
key->tex_wrap_states = sel_ctx->ctx->tex_wrap_states_shader_key;
key->n_images = 0;
if (prev) {
@ -1122,6 +1131,8 @@ d3d12_fill_shader_key(struct d3d12_selection_context *sel_ctx,
memcpy(&key->tex_wrap_states[i], &wrap_state, sizeof(wrap_state));
key->swizzle_state[i] = sel_ctx->ctx->tex_swizzle_state[stage][i];
}
else
memset(&key->tex_wrap_states[i], 0, sizeof(key->tex_wrap_states[i]));
}
}
@ -1144,6 +1155,8 @@ d3d12_fill_shader_key(struct d3d12_selection_context *sel_ctx,
key->n_texture_states * sizeof(enum compare_func));
memcpy(key->swizzle_state, sel_ctx->ctx->tex_swizzle_state[stage],
key->n_texture_states * sizeof(dxil_texture_swizzle_state));
if (!sel->samples_int_textures)
memset(key->tex_wrap_states, 0, sizeof(key->tex_wrap_states[0]) * key->n_texture_states);
}
if (stage == PIPE_SHADER_VERTEX && sel_ctx->ctx->gfx_pipeline_state.ves) {

2
src/gallium/drivers/d3d12/d3d12_compiler.h
View file

@ -177,7 +177,7 @@ struct d3d12_shader_key {
};
int n_texture_states;
dxil_wrap_sampler_state tex_wrap_states[PIPE_MAX_SHADER_SAMPLER_VIEWS];
dxil_wrap_sampler_state *tex_wrap_states;
dxil_texture_swizzle_state swizzle_state[PIPE_MAX_SHADER_SAMPLER_VIEWS];
enum compare_func sampler_compare_funcs[PIPE_MAX_SHADER_SAMPLER_VIEWS];

3
src/gallium/drivers/d3d12/d3d12_context.h
View file

@ -215,7 +215,10 @@ struct d3d12_context {
struct d3d12_sampler_state *samplers[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS];
unsigned num_samplers[PIPE_SHADER_TYPES];
D3D12_INDEX_BUFFER_VIEW ibv;
dxil_wrap_sampler_state tex_wrap_states[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
dxil_wrap_sampler_state tex_wrap_states_shader_key[PIPE_MAX_SHADER_SAMPLER_VIEWS];
dxil_texture_swizzle_state tex_swizzle_state[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];
enum compare_func tex_compare_func[PIPE_SHADER_TYPES][PIPE_MAX_SHADER_SAMPLER_VIEWS];