early-access version 2990

This commit is contained in:
pineappleEA 2022-10-05 05:37:01 +02:00
parent 9d3991e73e
commit e0da25b9c6
2 changed files with 22 additions and 5 deletions

View File

@ -1,7 +1,7 @@
yuzu emulator early access yuzu emulator early access
============= =============
This is the source code for early-access 2989. This is the source code for early-access 2990.
## Legal Notice ## Legal Notice

View File

@ -13,9 +13,6 @@ namespace Shader::Backend::GLASM {
namespace { namespace {
void GetCbuf(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, ScalarU32 offset, void GetCbuf(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, ScalarU32 offset,
std::string_view size) { std::string_view size) {
if (!binding.IsImmediate()) {
throw NotImplementedException("Indirect constant buffer loading");
}
const Register ret{ctx.reg_alloc.Define(inst)}; const Register ret{ctx.reg_alloc.Define(inst)};
if (offset.type == Type::U32) { if (offset.type == Type::U32) {
// Avoid reading arrays out of bounds, matching hardware's behavior // Avoid reading arrays out of bounds, matching hardware's behavior
@ -24,7 +21,27 @@ void GetCbuf(EmitContext& ctx, IR::Inst& inst, const IR::Value& binding, ScalarU
return; return;
} }
} }
ctx.Add("LDC.{} {},c{}[{}];", size, ret, binding.U32(), offset);
if (binding.IsImmediate()) {
ctx.Add("LDC.{} {},c{}[{}];", size, ret, binding.U32(), offset);
return;
}
const ScalarU32 idx{ctx.reg_alloc.Consume(binding)};
for (u32 i = 0; i < Info::MAX_INDIRECT_CBUFS; i++) {
ctx.Add("SEQ.S.CC RC.x,{},{};"
"IF NE.x;"
"LDC.{} {},c{}[{}];",
idx, i, size, ret, i, offset);
if (i != Info::MAX_INDIRECT_CBUFS - 1) {
ctx.Add("ELSE;");
}
}
for (u32 i = 0; i < Info::MAX_INDIRECT_CBUFS; i++) {
ctx.Add("ENDIF;");
}
} }
bool IsInputArray(Stage stage) { bool IsInputArray(Stage stage) {