KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: add spirv builder functions for image ops 

Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8504>
This commit is contained in:
Mike Blumenkrantz 2020-11-17 18:20:14 -05:00 committed by Marge Bot
parent 3d2ffb394a
commit 882ab6afb7
2 changed files with 120 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/gallium/drivers/zink/nir_to_spirv/spirv_builder.c
View File

@ -760,6 +760,101 @@ spirv_builder_emit_image(struct spirv_builder *b, SpvId result_type,
return result;
}
SpvId
spirv_builder_emit_image_texel_pointer(struct spirv_builder *b,
SpvId result_type,
SpvId image,
SpvId coordinate,
SpvId sample)
{
SpvId pointer_type = spirv_builder_type_pointer(b,
SpvStorageClassImage,
result_type);
return spirv_builder_emit_triop(b, SpvOpImageTexelPointer, pointer_type, image, coordinate, sample);
}
SpvId
spirv_builder_emit_image_read(struct spirv_builder *b,
SpvId result_type,
SpvId image,
SpvId coordinate,
SpvId lod,
SpvId sample,
SpvId offset)
{
SpvId result = spirv_builder_new_id(b);
SpvImageOperandsMask operand_mask = SpvImageOperandsMakeTexelVisibleMask | SpvImageOperandsNonPrivateTexelMask;
SpvId extra_operands[5];
int num_extra_operands = 1;
extra_operands[1] = spirv_builder_const_uint(b, 32, SpvScopeWorkgroup);
if (lod) {
extra_operands[++num_extra_operands] = lod;
operand_mask |= SpvImageOperandsLodMask;
}
if (sample) {
extra_operands[++num_extra_operands] = sample;
operand_mask |= SpvImageOperandsSampleMask;
}
if (offset) {
extra_operands[++num_extra_operands] = offset;
operand_mask |= SpvImageOperandsOffsetMask;
}
/* finalize num_extra_operands / extra_operands */
extra_operands[0] = operand_mask;
num_extra_operands++;
spirv_buffer_prepare(&b->instructions, b->mem_ctx, 5 + num_extra_operands);
spirv_buffer_emit_word(&b->instructions, SpvOpImageRead |
((5 + num_extra_operands) << 16));
spirv_buffer_emit_word(&b->instructions, result_type);
spirv_buffer_emit_word(&b->instructions, result);
spirv_buffer_emit_word(&b->instructions, image);
spirv_buffer_emit_word(&b->instructions, coordinate);
for (int i = 0; i < num_extra_operands; ++i)
spirv_buffer_emit_word(&b->instructions, extra_operands[i]);
return result;
}
void
spirv_builder_emit_image_write(struct spirv_builder *b,
SpvId image,
SpvId coordinate,
SpvId texel,
SpvId lod,
SpvId sample,
SpvId offset)
{
SpvImageOperandsMask operand_mask = SpvImageOperandsMakeTexelAvailableMask | SpvImageOperandsNonPrivateTexelMask;
SpvId extra_operands[5];
int num_extra_operands = 1;
extra_operands[1] = spirv_builder_const_uint(b, 32, SpvScopeWorkgroup);
if (lod) {
extra_operands[++num_extra_operands] = lod;
operand_mask |= SpvImageOperandsLodMask;
}
if (sample) {
extra_operands[++num_extra_operands] = sample;
operand_mask |= SpvImageOperandsSampleMask;
}
if (offset) {
extra_operands[++num_extra_operands] = offset;
operand_mask |= SpvImageOperandsOffsetMask;
}
/* finalize num_extra_operands / extra_operands */
extra_operands[0] = operand_mask;
num_extra_operands++;
spirv_buffer_prepare(&b->instructions, b->mem_ctx, 4 + num_extra_operands);
spirv_buffer_emit_word(&b->instructions, SpvOpImageWrite |
((4 + num_extra_operands) << 16));
spirv_buffer_emit_word(&b->instructions, image);
spirv_buffer_emit_word(&b->instructions, coordinate);
spirv_buffer_emit_word(&b->instructions, texel);
for (int i = 0; i < num_extra_operands; ++i)
spirv_buffer_emit_word(&b->instructions, extra_operands[i]);
}
SpvId
spirv_builder_emit_image_gather(struct spirv_builder *b,
SpvId result_type,

25
src/gallium/drivers/zink/nir_to_spirv/spirv_builder.h
View File

@ -268,6 +268,31 @@ SpvId
spirv_builder_emit_image(struct spirv_builder *b, SpvId result_type,
SpvId sampled_image);
SpvId
spirv_builder_emit_image_texel_pointer(struct spirv_builder *b,
SpvId result_type,
SpvId image,
SpvId coordinate,
SpvId sample);
SpvId
spirv_builder_emit_image_read(struct spirv_builder *b,
SpvId result_type,
SpvId image,
SpvId coordinate,
SpvId lod,
SpvId sample,
SpvId offset);
void
spirv_builder_emit_image_write(struct spirv_builder *b,
SpvId image,
SpvId coordinate,
SpvId texel,
SpvId lod,
SpvId sample,
SpvId offset);
SpvId
spirv_builder_emit_image_fetch(struct spirv_builder *b,
SpvId result_type,