diff options
| author | Jason Ekstrand <[email protected]> | 2017-10-26 10:08:21 -0700 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-10-26 15:24:38 -0700 |
| commit | 8ab9820d34d3a454e455c99e28ed2b6031b25b0f (patch) | |
| tree | 06119732055a73d04d2800b59099eab9265ee89d /src | |
| parent | 90dd6e5bb9f490a5ba8b86c6b0145554fc8d8a84 (diff) | |
spirv: Claim support for the simple memory model
It's rather surprising that we've never actually hit this before.
Aparently, Ian's SPIR-V generator currently claims the Simple when you
don't do anything complex. We really shouldn't assert-fail on it.
Reviewed-by: Ian Romanick <[email protected]>
Reviewed-by: Bas Nieuwenhuizen <[email protected]>
Cc: [email protected]
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/spirv/spirv_to_nir.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c index fe0a4efceb1..6825e0d6a82 100644 --- a/src/compiler/spirv/spirv_to_nir.c +++ b/src/compiler/spirv/spirv_to_nir.c @@ -2802,7 +2802,8 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode, case SpvOpMemoryModel: assert(w[1] == SpvAddressingModelLogical); - assert(w[2] == SpvMemoryModelGLSL450); + assert(w[2] == SpvMemoryModelSimple || + w[2] == SpvMemoryModelGLSL450); break; case SpvOpEntryPoint: { |