Mesa (master): spirv: Claim support for the simple memory model

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: 8ab9820d34d3a454e455c99e28ed2b6031b25b0f
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8ab9820d34d3a454e455c99e28ed2b6031b25b0f

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Thu Oct 26 10:08:21 2017 -0700

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 <ian.d.romanick at intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>
Cc: mesa-stable at lists.freedesktop.org

---

 src/compiler/spirv/spirv_to_nir.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/compiler/spirv/spirv_to_nir.c b/src/compiler/spirv/spirv_to_nir.c
index fe0a4efceb..6825e0d6a8 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: {