OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Make image_size a variable-width intrinsic

Browse Source 
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Connor Abbott <cwabbott0@gmail.com>
This commit is contained in:
Jason Ekstrand
2017-03-02 21:42:06 -08:00
parent b377be9213
commit e9a45a3d5d
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/compiler/glsl/glsl_to_nir.cpp
View File

@@ -865,10 +865,11 @@ nir_visitor::visit(ir_call *ir)
/* Set the intrinsic destination. */
if (ir->return_deref) {
const nir_intrinsic_info *info =
&nir_intrinsic_infos[instr->intrinsic];
unsigned num_components = ir->return_deref->type->vector_elements;
if (instr->intrinsic == nir_intrinsic_image_size)
instr->num_components = num_components;
nir_ssa_dest_init(&instr->instr, &instr->dest,
info->dest_components, 32, NULL);
num_components, 32, NULL);
}
if (op == nir_intrinsic_image_size ||

2
src/compiler/nir/nir_intrinsics.h
View File

@@ -186,7 +186,7 @@ INTRINSIC(image_atomic_or, 3, ARR(4, 1, 1), true, 1, 1, 0, xx, xx, xx, 0)
INTRINSIC(image_atomic_xor, 3, ARR(4, 1, 1), true, 1, 1, 0, xx, xx, xx, 0)
INTRINSIC(image_atomic_exchange, 3, ARR(4, 1, 1), true, 1, 1, 0, xx, xx, xx, 0)
INTRINSIC(image_atomic_comp_swap, 4, ARR(4, 1, 1, 1), true, 1, 1, 0, xx, xx, xx, 0)
INTRINSIC(image_size, 0, ARR(0), true, 4, 1, 0, xx, xx, xx,
INTRINSIC(image_size, 0, ARR(0), true, 0, 1, 0, xx, xx, xx,
NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER)
INTRINSIC(image_samples, 0, ARR(0), true, 1, 1, 0, xx, xx, xx,
NIR_INTRINSIC_CAN_ELIMINATE | NIR_INTRINSIC_CAN_REORDER)

18
src/compiler/spirv/spirv_to_nir.c
View File

@@ -1998,17 +1998,21 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
if (opcode != SpvOpImageWrite) {
struct vtn_value *val = vtn_push_value(b, w[2], vtn_value_type_ssa);
struct vtn_type *type = vtn_value(b, w[1], vtn_value_type_type)->type;
nir_ssa_dest_init(&intrin->instr, &intrin->dest, 4, 32, NULL);
unsigned dest_components =
nir_intrinsic_infos[intrin->intrinsic].dest_components;
if (intrin->intrinsic == nir_intrinsic_image_size) {
dest_components = intrin->num_components =
glsl_get_vector_elements(type->type);
}
nir_ssa_dest_init(&intrin->instr, &intrin->dest,
dest_components, 32, NULL);
nir_builder_instr_insert(&b->nb, &intrin->instr);
/* The image intrinsics always return 4 channels but we may not want
* that many. Emit a mov to trim it down.
*/
unsigned swiz[4] = {0, 1, 2, 3};
val->ssa = vtn_create_ssa_value(b, type->type);
val->ssa->def = nir_swizzle(&b->nb, &intrin->dest.ssa, swiz,
glsl_get_vector_elements(type->type), false);
val->ssa->def = &intrin->dest.ssa;
} else {
nir_builder_instr_insert(&b->nb, &intrin->instr);
}