mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-17 11:29:58 -04:00
Port Ocarina of Time (Switch 2) to the recomp host
The NVN2 front end and the SM86 to Maxwell shader lowering (tools/xlate/AmpereLowering.cs, mesh and task stages, bindless texture pools, BRX jump tables, the NVN2 compute c0 layout) with four translator patches (0017-0020) bring the opening of the game to 58-60 fps on the Vulkan renderer. This round fixes the haze: SM86 IPA is lowered as a plain Maxwell IPA.PASS (texture coordinates were corrected for perspective twice); LDSM, TXD, both F2IP byte forms, HMMA, MOVM and HFMA2.RELU are lowered and spill mode has eight uniform register groups; conditional rendering keeps the newest counter report per address and treats a report as pending until its value is in guest memory, so occlusion tests and the depth clears around the depth copy behave; and the upscaler stand-in decodes the post pass's sRGB picture before writing the linear target. Tensor-core programs keep the stand-in unless NX2NAVI_NATIVE_TENSOR=1, because their lowering does not match the hardware yet. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -739,8 +739,21 @@ static void clear_attachment(VkExec *ex, const VkClearAttachment *a) {
|
||||
ex->fb_dirty |= a->aspectMask & VK_IMAGE_ASPECT_COLOR_BIT ? 1u << a->colorAttachment : 0x100u;
|
||||
}
|
||||
|
||||
// NX2NAVI_LOG_RCOND=1: clears issued under a render condition (the first 400), run or skipped, with their target.
|
||||
static void clear_cond_log(const VkExec *ex, const char *what, int index) {
|
||||
static int on = -1, n;
|
||||
if (on < 0) on = rt_knob("LOG_RCOND", "0");
|
||||
if (!on || !ex->has_render_cond || n >= 400) return;
|
||||
n++;
|
||||
const VkExecTarget *t = index < 0 ? &ex->depth : index < (int)ex->pass_ncolor ? &ex->color[index] : NULL;
|
||||
rt_log("vk: %s clear %d under the condition at %#llx (mode %d): %s, target %ux%u", what, index,
|
||||
(unsigned long long)ex->render_cond.addr, ex->render_cond.mode, ex->render_disabled ? "skipped" : "run",
|
||||
t ? t->width : 0, t ? t->height : 0);
|
||||
}
|
||||
|
||||
static void clear_color(VkExec *ex, const p_clear_color *c) {
|
||||
vk_exec_frame.clears++;
|
||||
clear_cond_log(ex, "colour", c->index);
|
||||
if (ex->render_disabled) return;
|
||||
resolve_rt(ex);
|
||||
int i = c->index;
|
||||
@@ -771,6 +784,7 @@ static void clear_color(VkExec *ex, const p_clear_color *c) {
|
||||
}
|
||||
|
||||
static void clear_ds(VkExec *ex, const p_clear_ds *c) {
|
||||
clear_cond_log(ex, "depth", -1);
|
||||
if (ex->render_disabled) return;
|
||||
resolve_rt(ex);
|
||||
const VkExecTarget *t = &ex->depth;
|
||||
@@ -908,7 +922,8 @@ static void walk(VkExec *ex, const op_hdr *h, int depth) {
|
||||
if (h->op == OP_DRAW || h->op == OP_DRAW_IDX || h->op == OP_DRAW_IDX_IND) vk_exec_frame.draws_seen++, split_draws++;
|
||||
if (h->op == OP_DISPATCH || h->op == OP_DISPATCH_IND) vk_exec_frame.dispatches++, split_draws++;
|
||||
case OP_BIND_PROGRAM: case OP_BIND_STATE: case OP_BIND_VATTR: case OP_BIND_VSTREAM: case OP_BIND_VBUF:
|
||||
case OP_BIND_UBO: case OP_BIND_SSBO: case OP_BIND_TEX: case OP_BIND_SAMP: case OP_BIND_IMG:
|
||||
case OP_BIND_UBO: case OP_BIND_SSBO: case OP_BIND_TEX: case OP_BIND_SAMP: case OP_BIND_IMG: case OP_PUSH_CC:
|
||||
case OP_DRAW_MESH: case OP_DRAW_MESH_IND:
|
||||
vk_exec_op_draw(ex, h->op, a);
|
||||
break;
|
||||
case OP_COPY_B2B: case OP_COPY_B2T: case OP_COPY_T2B: case OP_COPY_T2T: case OP_CLEAR_TEX:
|
||||
|
||||
Reference in New Issue
Block a user