fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

zink: emit fbfetch variables as ntv input attachments

Browse source 
Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12603>
This commit is contained in:
Mike Blumenkrantz 2021-07-27 13:44:32 -04:00 • committed by Marge Bot
parent 73456393d8
commit c9edf964b0
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -673,6 +673,8 @@ type_to_dim(enum glsl_sampler_dim gdim, bool *is_ms)
case GLSL_SAMPLER_DIM_MS:
*is_ms = true;
return SpvDim2D;
case GLSL_SAMPLER_DIM_SUBPASS:
return SpvDimSubpassData;
default:
fprintf(stderr, "unknown sampler type %d\n", gdim);
break;
@ -805,7 +807,9 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var)
bool is_ms;
bool is_sampler = glsl_type_is_sampler(type);
if (!is_sampler && !var->data.image.format) {
if (var->data.fb_fetch_output) {
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityInputAttachment);
} else if (!is_sampler && !var->data.image.format) {
if (!(var->data.access & ACCESS_NON_WRITEABLE))
spirv_builder_emit_cap(&ctx->builder, SpvCapabilityStorageImageWriteWithoutFormat);
if (!(var->data.access & ACCESS_NON_READABLE))
@ -847,6 +851,9 @@ emit_image(struct ntv_context *ctx, struct nir_variable *var)
if (var->name)
spirv_builder_emit_name(&ctx->builder, var_id, var->name);
if (var->data.fb_fetch_output)
spirv_builder_emit_input_attachment_index(&ctx->builder, var_id, var->data.index);
if (is_sampler) {
ctx->sampler_types[index] = image_type;
ctx->samplers[index] = var_id;