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

zink: delete unused emit_image param in ntv

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21522>
This commit is contained in:
Mike Blumenkrantz 2023-02-24 10:10:17 -05:00 • committed by Marge Bot
parent fb4fd03db9
commit ac5f72a023
1 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gallium/drivers/zink/nir_to_spirv/nir_to_spirv.c
View file

@ -1015,7 +1015,7 @@ get_image_type(struct ntv_context *ctx, struct nir_variable *var, bool is_sample
}
static SpvId
emit_image(struct ntv_context *ctx, struct nir_variable *var, SpvId image_type, bool bindless)
emit_image(struct ntv_context *ctx, struct nir_variable *var, SpvId image_type)
{
if (var->data.bindless)
return 0;
@ -1029,7 +1029,7 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var, SpvId image_type,
assert(!is_sampler || !ctx->sampler_types[index]);
assert(is_sampler || !ctx->image_types[index]);
if (!bindless && glsl_type_is_array(var->type)) {
if (glsl_type_is_array(var->type)) {
var_type = spirv_builder_type_array(&ctx->builder, var_type,
emit_uint_const(ctx, 32, glsl_get_aoa_size(var->type)));
spirv_builder_emit_array_stride(&ctx->builder, var_type, sizeof(void*));
@ -1052,9 +1052,6 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var, SpvId image_type,
if (var->data.fb_fetch_output)
spirv_builder_emit_input_attachment_index(&ctx->builder, var_id, var->data.index);
if (bindless)
return var_id;
_mesa_hash_table_insert(ctx->vars, var, (void *)(intptr_t)var_id);
if (is_sampler) {
ctx->sampler_types[index] = image_type;
@ -4563,9 +4560,9 @@ nir_to_spirv(struct nir_shader *s, const struct zink_shader_info *sinfo, uint32_
nir_foreach_variable_with_modes(var, s, nir_var_image | nir_var_uniform) {
const struct glsl_type *type = glsl_without_array(var->type);
if (glsl_type_is_sampler(type))
emit_image(&ctx, var, get_bare_image_type(&ctx, var, true), false);
emit_image(&ctx, var, get_bare_image_type(&ctx, var, true));
else if (glsl_type_is_image(type))
emit_image(&ctx, var, get_bare_image_type(&ctx, var, false), false);
emit_image(&ctx, var, get_bare_image_type(&ctx, var, false));
}
switch (s->info.stage) {