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

pan/mdg: Move sampler_type emission to pack time

Browse source 
Signed-off-by: Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4793>
This commit is contained in:
Alyssa Rosenzweig 2020-04-27 19:23:17 -04:00 • committed by Marge Bot
parent 08af4c788d
commit bb0e85fca4
2 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/panfrost/midgard/midgard_compile.c
View file

@ -1722,21 +1722,6 @@ pan_attach_constant_bias(
return true;
}
static enum mali_sampler_type
midgard_sampler_type(nir_alu_type t) {
switch (nir_alu_type_get_base_type(t))
{
case nir_type_float:
return MALI_SAMPLER_FLOAT;
case nir_type_int:
return MALI_SAMPLER_SIGNED;
case nir_type_uint:
return MALI_SAMPLER_UNSIGNED;
default:
unreachable("Unknown sampler type");
}
}
static void
emit_texop_native(compiler_context *ctx, nir_tex_instr *instr,
unsigned midgard_texop)
@ -1762,7 +1747,6 @@ emit_texop_native(compiler_context *ctx, nir_tex_instr *instr,
.format = midgard_tex_format(instr->sampler_dim),
.texture_handle = texture_index,
.sampler_handle = sampler_index,
.sampler_type = midgard_sampler_type(instr->dest_type),
.shadow = instr->is_shadow,
}
};

16
src/panfrost/midgard/midgard_emit.c
View file

@ -397,6 +397,21 @@ mir_ldst_imm_shift(midgard_load_store_op op)
return 1;
}
static enum mali_sampler_type
midgard_sampler_type(nir_alu_type t) {
switch (nir_alu_type_get_base_type(t))
{
case nir_type_float:
return MALI_SAMPLER_FLOAT;
case nir_type_int:
return MALI_SAMPLER_SIGNED;
case nir_type_uint:
return MALI_SAMPLER_UNSIGNED;
default:
unreachable("Unknown sampler type");
}
}
/* After everything is scheduled, emit whole bundles at a time */
void
@ -482,6 +497,7 @@ emit_binary_bundle(compiler_context *ctx,
ins->texture.out_full = (osz == 32);
ins->texture.in_reg_full = (isz == 32);
ins->texture.sampler_type = midgard_sampler_type(ins->dest_type);
ctx->texture_op_count--;