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

d3d12: Upgrade first vertex state var into all vertex draw params

Browse source 
Add in base instance, draw ID, and is-indexed-draw

Reviewed-by: Sil Vilerino <sivileri@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14486>
This commit is contained in:
Jesse Natalie 2022-01-10 14:09:30 -08:00 • committed by Marge Bot
parent a98508d092
commit aaceb10b0f
5 changed files with 27 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -170,7 +170,7 @@ compile_nir(struct d3d12_context *ctx, struct d3d12_shader_selector *sel,
NIR_PASS_V(nir, d3d12_lower_yflip); NIR_PASS_V(nir, d3d12_lower_yflip);
} }
NIR_PASS_V(nir, nir_lower_packed_ubo_loads); NIR_PASS_V(nir, nir_lower_packed_ubo_loads);
NIR_PASS_V(nir, d3d12_lower_load_first_vertex); NIR_PASS_V(nir, d3d12_lower_load_draw_params);
NIR_PASS_V(nir, d3d12_lower_state_vars, shader); NIR_PASS_V(nir, d3d12_lower_state_vars, shader);
NIR_PASS_V(nir, dxil_nir_lower_bool_input); NIR_PASS_V(nir, dxil_nir_lower_bool_input);
NIR_PASS_V(nir, dxil_nir_lower_loads_stores_to_dxil); NIR_PASS_V(nir, dxil_nir_lower_loads_stores_to_dxil);

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

@ -43,7 +43,7 @@ extern "C" {
enum d3d12_state_var { enum d3d12_state_var {
D3D12_STATE_VAR_Y_FLIP = 0, D3D12_STATE_VAR_Y_FLIP = 0,
D3D12_STATE_VAR_PT_SPRITE, D3D12_STATE_VAR_PT_SPRITE,
D3D12_STATE_VAR_FIRST_VERTEX, D3D12_STATE_VAR_DRAW_PARAMS,
D3D12_STATE_VAR_DEPTH_TRANSFORM, D3D12_STATE_VAR_DEPTH_TRANSFORM,
D3D12_MAX_GRAPHICS_STATE_VARS, D3D12_MAX_GRAPHICS_STATE_VARS,

12
src/gallium/drivers/d3d12/d3d12_draw.cpp
View file

@ -340,6 +340,7 @@ fill_image_descriptors(struct d3d12_context *ctx,
static unsigned static unsigned
fill_graphics_state_vars(struct d3d12_context *ctx, fill_graphics_state_vars(struct d3d12_context *ctx,
const struct pipe_draw_info *dinfo, const struct pipe_draw_info *dinfo,
unsigned drawid,
const struct pipe_draw_start_count_bias *draw, const struct pipe_draw_start_count_bias *draw,
struct d3d12_shader *shader, struct d3d12_shader *shader,
uint32_t *values) uint32_t *values)
@ -361,8 +362,11 @@ fill_graphics_state_vars(struct d3d12_context *ctx,
ptr[3] = fui(D3D12_MAX_POINT_SIZE); ptr[3] = fui(D3D12_MAX_POINT_SIZE);
size += 4; size += 4;
break; break;
case D3D12_STATE_VAR_FIRST_VERTEX: case D3D12_STATE_VAR_DRAW_PARAMS:
ptr[0] = dinfo->index_size ? draw->index_bias : draw->start; ptr[0] = dinfo->index_size ? draw->index_bias : draw->start;
ptr[1] = dinfo->start_instance;
ptr[2] = drawid;
ptr[3] = dinfo->index_size ? -1 : 0;
size += 4; size += 4;
break; break;
case D3D12_STATE_VAR_DEPTH_TRANSFORM: case D3D12_STATE_VAR_DEPTH_TRANSFORM:
@ -500,6 +504,7 @@ update_shader_stage_root_parameters(struct d3d12_context *ctx,
static unsigned static unsigned
update_graphics_root_parameters(struct d3d12_context *ctx, update_graphics_root_parameters(struct d3d12_context *ctx,
const struct pipe_draw_info *dinfo, const struct pipe_draw_info *dinfo,
unsigned drawid,
const struct pipe_draw_start_count_bias *draw, const struct pipe_draw_start_count_bias *draw,
D3D12_GPU_DESCRIPTOR_HANDLE root_desc_tables[MAX_DESCRIPTOR_TABLES], D3D12_GPU_DESCRIPTOR_HANDLE root_desc_tables[MAX_DESCRIPTOR_TABLES],
int root_desc_indices[MAX_DESCRIPTOR_TABLES]) int root_desc_indices[MAX_DESCRIPTOR_TABLES])
@ -516,7 +521,7 @@ update_graphics_root_parameters(struct d3d12_context *ctx,
/* TODO Don't always update state vars */ /* TODO Don't always update state vars */
if (shader_sel->current->num_state_vars > 0) { if (shader_sel->current->num_state_vars > 0) {
uint32_t constants[D3D12_MAX_GRAPHICS_STATE_VARS * 4]; uint32_t constants[D3D12_MAX_GRAPHICS_STATE_VARS * 4];
unsigned size = fill_graphics_state_vars(ctx, dinfo, draw, shader_sel->current, constants); unsigned size = fill_graphics_state_vars(ctx, dinfo, drawid, draw, shader_sel->current, constants);
ctx->cmdlist->SetGraphicsRoot32BitConstants(num_params, size, constants, 0); ctx->cmdlist->SetGraphicsRoot32BitConstants(num_params, size, constants, 0);
num_params++; num_params++;
} }
@ -847,7 +852,8 @@ d3d12_draw_vbo(struct pipe_context *pctx,
D3D12_GPU_DESCRIPTOR_HANDLE root_desc_tables[MAX_DESCRIPTOR_TABLES]; D3D12_GPU_DESCRIPTOR_HANDLE root_desc_tables[MAX_DESCRIPTOR_TABLES];
int root_desc_indices[MAX_DESCRIPTOR_TABLES]; int root_desc_indices[MAX_DESCRIPTOR_TABLES];
unsigned num_root_descriptors = update_graphics_root_parameters(ctx, dinfo, &draws[0], root_desc_tables, root_desc_indices); unsigned num_root_descriptors = update_graphics_root_parameters(ctx, dinfo, drawid_offset, &draws[0],
root_desc_tables, root_desc_indices);
bool need_zero_one_depth_range = d3d12_need_zero_one_depth_range(ctx); bool need_zero_one_depth_range = d3d12_need_zero_one_depth_range(ctx);
if (need_zero_one_depth_range != ctx->need_zero_one_depth_range) { if (need_zero_one_depth_range != ctx->need_zero_one_depth_range) {

40
src/gallium/drivers/d3d12/d3d12_nir_passes.c
View file

@ -318,51 +318,41 @@ d3d12_lower_uint_cast(nir_shader *nir, bool is_signed)
} }
static bool static bool
lower_load_first_vertex(nir_builder *b, nir_instr *instr, nir_variable **first_vertex) lower_load_draw_params(nir_builder *b, nir_instr *instr, void *draw_params)
{ {
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
return false; return false;
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_load_first_vertex) if (intr->intrinsic != nir_intrinsic_load_first_vertex &&
intr->intrinsic != nir_intrinsic_load_base_instance &&
intr->intrinsic != nir_intrinsic_load_draw_id &&
intr->intrinsic != nir_intrinsic_load_is_indexed_draw)
return false; return false;
b->cursor = nir_before_instr(&intr->instr); b->cursor = nir_before_instr(&intr->instr);
nir_ssa_def *load = d3d12_get_state_var(b, D3D12_STATE_VAR_FIRST_VERTEX, "d3d12_FirstVertex", nir_ssa_def *load = d3d12_get_state_var(b, D3D12_STATE_VAR_DRAW_PARAMS, "d3d12_DrawParams",
glsl_uint_type(), first_vertex); glsl_uvec4_type(), draw_params);
nir_ssa_def_rewrite_uses(&intr->dest.ssa, load); unsigned channel = intr->intrinsic == nir_intrinsic_load_first_vertex ? 0 :
intr->intrinsic == nir_intrinsic_load_base_instance ? 1 :
intr->intrinsic == nir_intrinsic_load_draw_id ? 2 : 3;
nir_ssa_def_rewrite_uses(&intr->dest.ssa, nir_channel(b, load, channel));
nir_instr_remove(instr); nir_instr_remove(instr);
return true; return true;
} }
bool bool
d3d12_lower_load_first_vertex(struct nir_shader *nir) d3d12_lower_load_draw_params(struct nir_shader *nir)
{ {
nir_variable *first_vertex = NULL; nir_variable *draw_params = NULL;
bool progress = false;
if (nir->info.stage != MESA_SHADER_VERTEX) if (nir->info.stage != MESA_SHADER_VERTEX)
return false; return false;
nir_foreach_function(function, nir) { return nir_shader_instructions_pass(nir, lower_load_draw_params,
if (function->impl) { nir_metadata_block_index | nir_metadata_dominance, &draw_params);
nir_builder b;
nir_builder_init(&b, function->impl);
nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(instr, block) {
progress |= lower_load_first_vertex(&b, instr, &first_vertex);
}
}
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance);
}
}
return progress;
} }
static void static void

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

@ -62,7 +62,7 @@ void
d3d12_lower_depth_range(nir_shader *nir); d3d12_lower_depth_range(nir_shader *nir);
bool bool
d3d12_lower_load_first_vertex(nir_shader *nir); d3d12_lower_load_draw_params(nir_shader *nir);
bool bool
d3d12_lower_compute_state_vars(nir_shader *nir); d3d12_lower_compute_state_vars(nir_shader *nir);