fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 13:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

spirv: Claim support for the simple memory model

Browse source 
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@intel.com>
Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Cc: mesa-stable@lists.freedesktop.org
(cherry picked from commit 8ab9820d34)
This commit is contained in:
Jason Ekstrand 2017-10-26 10:08:21 -07:00 • committed by Emil Velikov
parent b0082632eb
commit 66603bff6f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/compiler/spirv/spirv_to_nir.c
View file

@ -2802,7 +2802,8 @@ vtn_handle_preamble_instruction(struct vtn_builder *b, SpvOp opcode,
case SpvOpMemoryModel: case SpvOpMemoryModel:
assert(w[1] == SpvAddressingModelLogical); assert(w[1] == SpvAddressingModelLogical);
assert(w[2] == SpvMemoryModelGLSL450); assert(w[2] == SpvMemoryModelSimple ||
w[2] == SpvMemoryModelGLSL450);
break; break;
case SpvOpEntryPoint: { case SpvOpEntryPoint: {