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

spirv: fix AtomicLoad/Store on images

Browse Source 
OpAtomicLoad/Store should have pointer to images just like the rest of the
atomic operators. These couple of lines were poorly copied from the
ssbo/shared_vars cases (the only ones currently tests by the CTS).

Fixes 2afb950161 ("spirv/nir: Add support for OpAtomicLoad/Store")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Lionel Landwerlin
2016-09-19 17:14:18 +01:00
parent 36f0f03182
commit 9adfa695ac
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1671,6 +1671,7 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
case SpvOpAtomicIDecrement: case SpvOpAtomicIDecrement:
case SpvOpAtomicIAdd: case SpvOpAtomicIAdd:
case SpvOpAtomicISub: case SpvOpAtomicISub:
case SpvOpAtomicLoad:
case SpvOpAtomicSMin: case SpvOpAtomicSMin:
case SpvOpAtomicUMin: case SpvOpAtomicUMin:
case SpvOpAtomicSMax: case SpvOpAtomicSMax:
@@ -1681,17 +1682,9 @@ vtn_handle_image(struct vtn_builder *b, SpvOp opcode,
image = *vtn_value(b, w[3], vtn_value_type_image_pointer)->image; image = *vtn_value(b, w[3], vtn_value_type_image_pointer)->image;
break; break;
case SpvOpAtomicLoad: { case SpvOpAtomicStore:
image.image = image = *vtn_value(b, w[1], vtn_value_type_image_pointer)->image;
vtn_value(b, w[3], vtn_value_type_access_chain)->access_chain;
break; break;
}
case SpvOpAtomicStore: {
image.image =
vtn_value(b, w[1], vtn_value_type_access_chain)->access_chain;
break;
}
case SpvOpImageQuerySize: case SpvOpImageQuerySize:
image.image = image.image =