diff options
| author |  ReinUsesLisp | 2021-05-26 21:24:30 -0300 |
|---|---|---|
| committer |  ameerj | 2021-07-22 21:51:33 -0400 |
| commit | e240a62017f240160896b617bb109a0bcea08516 (patch) | |
| tree | ca0fb4a55705cb83bc8e17740bef0ba364190009 | |
| parent | Revert "glasm: Skip phi moves on undefined instructions" (diff) | |
| download | yuzu-e240a62017f240160896b617bb109a0bcea08516.tar.gz yuzu-e240a62017f240160896b617bb109a0bcea08516.tar.xz yuzu-e240a62017f240160896b617bb109a0bcea08516.zip | |
glasm: Fix global memory fallbacks
| -rw-r--r-- | src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp b/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp index 90dbb80d2..cafb5c92a 100644 --- a/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp +++ b/src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp | |||
| @@ -38,14 +38,14 @@ void GlobalStorageOp(EmitContext& ctx, Register address, bool pointer_based, std | |||
| 38 | continue; | 38 | continue; |
| 39 | } | 39 | } |
| 40 | const auto& ssbo{ctx.info.storage_buffers_descriptors[index]}; | 40 | const auto& ssbo{ctx.info.storage_buffers_descriptors[index]}; |
| 41 | ctx.Add("LDC.U64 DC.x,c{}[{}];" // ssbo_addr | 41 | ctx.Add("LDC.U64 DC.x,c{}[{}];" // ssbo_addr |
| 42 | "LDC.U32 RC.x,c{}[{}];" // ssbo_size_u32 | 42 | "LDC.U32 RC.x,c{}[{}];" // ssbo_size_u32 |
| 43 | "CVT.U64.U32 DC.y,RC.x;" // ssbo_size = ssbo_size_u32 | 43 | "CVT.U64.U32 DC.y,RC.x;" // ssbo_size = ssbo_size_u32 |
| 44 | "ADD.U64 DC.y,DC.y,DC.x;" // ssbo_end = ssbo_addr + ssbo_size | 44 | "ADD.U64 DC.y,DC.y,DC.x;" // ssbo_end = ssbo_addr + ssbo_size |
| 45 | "SGE.U64 RC.x,{}.x,DC.x;" // a = input_addr >= ssbo_addr ? -1 : 1 | 45 | "SGE.U64 RC.x,{}.x,DC.x;" // a = input_addr >= ssbo_addr ? -1 : 0 |
| 46 | "SLT.U64 RC.y,{}.x,DC.y;" // b = input_addr < ssbo_end ? -1 : 1 | 46 | "SLT.U64 RC.y,{}.x,DC.y;" // b = input_addr < ssbo_end ? -1 : 0 |
| 47 | "AND.U.CC RC.x,RC.x,RC.y;" | 47 | "AND.U.CC RC.x,RC.x,RC.y;" // cond = a && b |
| 48 | "IF NE.x;" // a && b | 48 | "IF NE.x;" // if cond |
| 49 | "SUB.U64 DC.x,{}.x,DC.x;", // offset = input_addr - ssbo_addr | 49 | "SUB.U64 DC.x,{}.x,DC.x;", // offset = input_addr - ssbo_addr |
| 50 | ssbo.cbuf_index, ssbo.cbuf_offset, ssbo.cbuf_index, ssbo.cbuf_offset + 8, address, | 50 | ssbo.cbuf_index, ssbo.cbuf_offset, ssbo.cbuf_index, ssbo.cbuf_offset + 8, address, |
| 51 | address, address); | 51 | address, address); |
| @@ -65,7 +65,8 @@ void GlobalStorageOp(EmitContext& ctx, Register address, bool pointer_based, std | |||
| 65 | if (!else_expr.empty()) { | 65 | if (!else_expr.empty()) { |
| 66 | ctx.Add("{}", else_expr); | 66 | ctx.Add("{}", else_expr); |
| 67 | } | 67 | } |
| 68 | for (size_t index = 0; index < num_buffers; ++index) { | 68 | const size_t num_used_buffers{ctx.info.nvn_buffer_used.count()}; |
| 69 | for (size_t index = 0; index < num_used_buffers; ++index) { | ||
| 69 | ctx.Add("ENDIF;"); | 70 | ctx.Add("ENDIF;"); |
| 70 | } | 71 | } |
| 71 | } | 72 | } |