mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-15 19:19:58 -04:00
9d5f16bda4
A draw that finds every query slot still waiting for the completion thread goes uncounted, and the report after it said only what the other draws counted, at least 1: the game takes the object it tested for all but hidden for that frame. With the setting the report writes the larger of that and the last complete count reported into the same record. Off by default and read at start; the count of such reports is logged at the 1st, 10th, 100th and so on either way. tests/oq_hold_check.py checks the rule. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
67 lines
3.7 KiB
C
67 lines
3.7 KiB
C
// runtime/vk_oq_hold.h: the count a samples-passed report writes when the full occlusion query ring left some of its
|
|
// draws uncounted (vk_exec_xfer.c oq_report_count, NX2NAVI_OQ_HOLD). Built and run by tests/oq_hold_check.py; prints
|
|
// each failed check and exits 1 on any.
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "vk_oq_hold.h"
|
|
|
|
static int fails;
|
|
#define CHECK(c, ...) do { if (!(c)) { fails++; printf("FAIL line %d: ", __LINE__); printf(__VA_ARGS__); printf("\n"); } } while (0)
|
|
|
|
static OqHold t;
|
|
|
|
int main(void) {
|
|
// ---- nothing remembered: the old rule, what was counted and at least 1
|
|
CHECK(oqh_lost(&t, 0x5000, 0) == 1, "an empty table gave %llu for nothing counted, not 1",
|
|
(unsigned long long)oqh_lost(&t, 0x5000, 0));
|
|
CHECK(oqh_lost(&t, 0x5000, 37) == 37, "an empty table changed a count of 37");
|
|
// ---- a record reported complete, then a frame that missed draws: the last count holds
|
|
oqh_note(&t, 0x5000, 4096);
|
|
CHECK(oqh_lost(&t, 0x5000, 0) == 4096, "a lost report of a record last at 4096 gave %llu",
|
|
(unsigned long long)oqh_lost(&t, 0x5000, 0));
|
|
CHECK(oqh_lost(&t, 0x5000, 12) == 4096, "a lost report that counted 12 of its draws gave %llu, not the held 4096",
|
|
(unsigned long long)oqh_lost(&t, 0x5000, 12));
|
|
// what was counted is a lower bound: above the held count it wins
|
|
CHECK(oqh_lost(&t, 0x5000, 5000) == 5000, "a lost report that counted 5000 gave %llu",
|
|
(unsigned long long)oqh_lost(&t, 0x5000, 5000));
|
|
// ---- a newer complete report replaces the held count, an occluded one too
|
|
oqh_note(&t, 0x5000, 0);
|
|
CHECK(oqh_lost(&t, 0x5000, 0) == 1, "a record last reported hidden (0) gave %llu for a lost report, not 1",
|
|
(unsigned long long)oqh_lost(&t, 0x5000, 0));
|
|
oqh_note(&t, 0x5000, 300);
|
|
CHECK(oqh_lost(&t, 0x5000, 7) == 300, "the newest complete count (300) did not hold");
|
|
// ---- other records keep their own counts; a record next to it is another one
|
|
oqh_note(&t, 0x5010, 9000);
|
|
CHECK(oqh_lost(&t, 0x5000, 0) == 300 || oqh_slot(0x5000) == oqh_slot(0x5010),
|
|
"the record 16 bytes on changed this one's count");
|
|
CHECK(oqh_lost(&t, 0x5010, 2) == 9000, "the record 16 bytes on did not hold its own count");
|
|
CHECK(oqh_lost(&t, 0x6000, 2) == 2, "a record never reported took another's count");
|
|
// ---- a record that shares a slot with another forgets the older count, never takes the other's
|
|
uint64_t a = 0x100000, b = 0;
|
|
for (uint64_t x = a + 16; x < a + (1ull << 24); x += 16)
|
|
if (oqh_slot(x) == oqh_slot(a)) { b = x; break; }
|
|
CHECK(b != 0, "no address shares a slot with %#llx in 16 MiB", (unsigned long long)a);
|
|
if (b) {
|
|
oqh_note(&t, a, 111);
|
|
oqh_note(&t, b, 222);
|
|
CHECK(oqh_lost(&t, a, 3) == 3, "an overwritten record gave %llu, not what it counted",
|
|
(unsigned long long)oqh_lost(&t, a, 3));
|
|
CHECK(oqh_lost(&t, b, 3) == 222, "the newer record of a slot lost its count");
|
|
}
|
|
// ---- a report with no CPU-visible record (address 0) is neither remembered nor held
|
|
oqh_note(&t, 0, 777);
|
|
CHECK(oqh_lost(&t, 0, 0) == 1, "address 0 was remembered");
|
|
// ---- the 1024 records of a frame's queries spread over the table: few collisions among consecutive records
|
|
int used[OQH_N];
|
|
memset(used, 0, sizeof used);
|
|
int collisions = 0;
|
|
for (int i = 0; i < 256; i++) {
|
|
uint32_t s = oqh_slot(0x2692c7000ull + 32ull * (uint64_t)i);
|
|
collisions += used[s]++ != 0;
|
|
}
|
|
CHECK(collisions < 64, "256 records 32 bytes apart collided %d times in %d slots", collisions, OQH_N);
|
|
if (!fails) printf("oq_hold_check: all checks passed\n");
|
|
return fails ? 1 : 0;
|
|
}
|