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

microsoft/compiler: Emit sampleCmpLevel when needed

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19537>
This commit is contained in:
Jesse Natalie 2022-08-26 08:53:46 -07:00 • committed by Marge Bot
parent 442d1fe5ad
commit a3dbc9ac25
2 changed files with 27 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/microsoft/compiler/dxil_function.c
View file

@ -58,6 +58,7 @@ static struct predefined_func_descr predefined_funcs[] = {
{"dx.op.sampleLevel", "R", "i@@ffffiiif", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.sampleGrad", "R", "i@@ffffiiifffffff", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.sampleCmp", "R", "i@@ffffiiiff", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.sampleCmpLevel", "R", "i@@ffffiiiff", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.sampleCmpLevelZero", "R", "i@@ffffiiif", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.textureLoad", "R", "i@iiiiiii", DXIL_ATTR_KIND_READ_ONLY},
{"dx.op.textureGather", "R", "i@@ffffiii", DXIL_ATTR_KIND_READ_ONLY},

28
src/microsoft/compiler/nir_to_dxil.c
View file

@ -336,6 +336,7 @@ enum dxil_intr {
DXIL_INTR_CREATE_HANDLE_FROM_BINDING = 217,
DXIL_INTR_IS_HELPER_LANE = 221,
DXIL_INTR_SAMPLE_CMP_LEVEL = 224,
};
enum dxil_atomic_op {
@ -4859,7 +4860,7 @@ emit_sample_cmp(struct ntd_context *ctx, struct texop_parameters *params)
enum dxil_intr opcode;
int numparam;
if (ctx->mod.shader_kind == DXIL_PIXEL_SHADER) {
if (ctx->mod.shader_kind == DXIL_PIXEL_SHADER) {
func = dxil_get_function(&ctx->mod, "dx.op.sampleCmp", DXIL_F32);
opcode = DXIL_INTR_SAMPLE_CMP;
numparam = 12;
@ -4883,6 +4884,26 @@ emit_sample_cmp(struct ntd_context *ctx, struct texop_parameters *params)
return dxil_emit_call(&ctx->mod, func, args, numparam);
}
static const struct dxil_value *
emit_sample_cmp_level(struct ntd_context *ctx, struct texop_parameters *params)
{
const struct dxil_func *func = dxil_get_function(&ctx->mod, "dx.op.sampleCmpLevel", params->overload);
if (!func)
return NULL;
assert(params->lod_or_sample != NULL);
const struct dxil_value *args[12] = {
dxil_module_get_int32_const(&ctx->mod, DXIL_INTR_SAMPLE_CMP_LEVEL),
params->tex, params->sampler,
params->coord[0], params->coord[1], params->coord[2], params->coord[3],
params->offset[0], params->offset[1], params->offset[2],
params->cmp, params->lod_or_sample
};
return dxil_emit_call(&ctx->mod, func, args, ARRAY_SIZE(args));
}
static const struct dxil_value *
emit_sample_grad(struct ntd_context *ctx, struct texop_parameters *params)
{
@ -5129,7 +5150,10 @@ emit_tex(struct ntd_context *ctx, nir_tex_instr *instr)
params.lod_or_sample = dxil_module_get_float_const(&ctx->mod, 0);
FALLTHROUGH;
case nir_texop_txl:
sample = emit_sample_level(ctx, &params);
if (params.cmp != NULL)
sample = emit_sample_cmp_level(ctx, &params);
else
sample = emit_sample_level(ctx, &params);
break;
case nir_texop_txd: