octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

glasm: Fix global memory callbacks

Browse Source
This commit is contained in:
ReinUsesLisp
2021-05-26 03:34:59 -03:00
committed by ameerj
parent a41b2ed391
commit 8763cc1ff7
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/shader_recompiler/backend/glasm/emit_glasm_memory.cpp
View File

@@ -37,8 +37,8 @@ void GlobalStorageOp(EmitContext& ctx, Register address, std::string_view then_e
continue; continue;
} }
const auto& ssbo{ctx.info.storage_buffers_descriptors[index]}; const auto& ssbo{ctx.info.storage_buffers_descriptors[index]};
ctx.Add("LDC.U64 DC.x,c[{}];" // ssbo_addr ctx.Add("LDC.U64 DC.x,c{}[{}];" // ssbo_addr
"LDC.U32 RC.x,c[{}];" // ssbo_size_u32 "LDC.U32 RC.x,c{}[{}];" // ssbo_size_u32
"CVT.U64.U32 DC.y,RC.x;" // ssbo_size = ssbo_size_u32 "CVT.U64.U32 DC.y,RC.x;" // ssbo_size = ssbo_size_u32
"ADD.U64 DC.y,DC.y,DC.x;" // ssbo_end = ssbo_addr + ssbo_size "ADD.U64 DC.y,DC.y,DC.x;" // ssbo_end = ssbo_addr + ssbo_size
"SGE.U64 RC.x,{}.x,DC.x;" // a = input_addr >= ssbo_addr ? -1 : 1 "SGE.U64 RC.x,{}.x,DC.x;" // a = input_addr >= ssbo_addr ? -1 : 1
@@ -48,9 +48,10 @@ void GlobalStorageOp(EmitContext& ctx, Register address, std::string_view then_e
"SUB.U64 DC.x,{}.x,DC.x;" // offset = input_addr - ssbo_addr "SUB.U64 DC.x,{}.x,DC.x;" // offset = input_addr - ssbo_addr
"PK64.U DC.y,c[{}];" // host_ssbo = cbuf "PK64.U DC.y,c[{}];" // host_ssbo = cbuf
"ADD.U64 DC.x,DC.x,DC.y;" // host_addr = host_ssbo + offset "ADD.U64 DC.x,DC.x,DC.y;" // host_addr = host_ssbo + offset
"{}", "{}"
"ELSE;", index, index, ssbo.cbuf_offset, ssbo.cbuf_offset + 8, address, address, "ELSE;",
address, index, then_expr); ssbo.cbuf_index, ssbo.cbuf_offset, ssbo.cbuf_index, ssbo.cbuf_offset + 8, address,
address, address, index, then_expr);
} }
if (!else_expr.empty()) { if (!else_expr.empty()) {
ctx.Add("{}", else_expr); ctx.Add("{}", else_expr);