From: Nicolai Hähnle Date: Fri, 9 Jun 2017 13:16:14 +0000 (+0200) Subject: radeonsi/nir: set si_shader_context::num_{sampler,images} X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=677bd47cb96679cd6a75b0a11019797272fcba03;p=mesa.git radeonsi/nir: set si_shader_context::num_{sampler,images} Reviewed-by: Marek Olšák --- diff --git a/src/gallium/drivers/radeonsi/si_shader_nir.c b/src/gallium/drivers/radeonsi/si_shader_nir.c index 22c7e238456..0eb8f9704e8 100644 --- a/src/gallium/drivers/radeonsi/si_shader_nir.c +++ b/src/gallium/drivers/radeonsi/si_shader_nir.c @@ -375,6 +375,8 @@ si_nir_load_sampler_desc(struct ac_shader_abi *abi, bool si_nir_build_llvm(struct si_shader_context *ctx, struct nir_shader *nir) { + struct tgsi_shader_info *info = &ctx->shader->selector->info; + unsigned fs_attr_idx = 0; nir_foreach_variable(variable, &nir->inputs) { unsigned attrib_count = glsl_count_attribute_slots(variable->type, @@ -399,6 +401,9 @@ bool si_nir_build_llvm(struct si_shader_context *ctx, struct nir_shader *nir) ctx->abi.inputs = &ctx->inputs[0]; ctx->abi.load_sampler_desc = si_nir_load_sampler_desc; + ctx->num_samplers = util_last_bit(info->samplers_declared); + ctx->num_images = util_last_bit(info->images_declared); + ac_nir_translate(&ctx->ac, &ctx->abi, nir, NULL); return true;