mirror of
https://github.com/tangerineturtle1/NX2navi.git
synced 2026-11-18 19:39:57 -04:00
Merge the Linux pull requests into the 0.7.0 release line.
Eighteen commits, one per Linux pull request that was not in yet: the build fix for a source checkout, NVIDIA's shader disk cache only with NVIDIA's driver, tools/run_game.py for a Linux game folder, a memory limit the low-memory handling can read, the recording thread's core on Linux, shadow storage on Linux and Proton, the Steam Deck profile and prompts, FSR 3.1 offered only where its library loads, DLSS frame generation through NGX on Linux, the AppImage with its window and its workflow, and the processor level from /proc/cpuinfo. Two conflicts: the settings table keeps the area-load settings under the new comment, and the example file keeps the lazy write-back as off by default and adds that it stays off with shadow storage. Co-Authored-By: Claude Fable 5.2 <noreply@anthropic.com>
This commit is contained in:
@@ -161,7 +161,7 @@ static void collect(const op_hdr *h, int depth) {
|
||||
if (k && known) {
|
||||
if (!(nc[ci].ok >> (k + 1) & 1)) continue;
|
||||
} else if (k) {
|
||||
if (!vk_mem_resolve(lo, at + n - lo, &sp) || sp.alloc || !sp.pool || sp.avail < at + n - lo ||
|
||||
if (!vk_mem_lookup(lo, at + n - lo, &sp) || sp.alloc || !sp.pool || sp.avail < at + n - lo ||
|
||||
(sp.cls != VK_MCLS_HOST_CACHED && sp.cls != VK_MCLS_HOST_UNC))
|
||||
continue;
|
||||
ok |= 1 << (k + 1);
|
||||
@@ -375,7 +375,7 @@ void vk_usnap_begin(const uint64_t *handles, int n, uint64_t fence) {
|
||||
for (i++; i < U.ncol && U.col[i].lo <= hi; i++)
|
||||
if (U.col[i].hi > hi) hi = U.col[i].hi;
|
||||
VkMemSpan sp;
|
||||
if (!vk_mem_resolve(lo, hi - lo, &sp) || sp.alloc || !sp.pool || sp.avail < hi - lo ||
|
||||
if (!vk_mem_lookup(lo, hi - lo, &sp) || sp.alloc || !sp.pool || sp.avail < hi - lo ||
|
||||
(sp.cls != VK_MCLS_HOST_CACHED && sp.cls != VK_MCLS_HOST_UNC)) {
|
||||
U.refused++;
|
||||
continue;
|
||||
@@ -451,7 +451,7 @@ static int wr_overlaps(uint64_t lo, uint64_t hi) {
|
||||
|
||||
static int cpu_written(uint64_t addr, uint64_t n) { // the same test vk_usnap_begin keeps regions by
|
||||
VkMemSpan sp;
|
||||
return vk_mem_resolve(addr, n, &sp) && !sp.alloc && sp.pool && sp.avail >= n &&
|
||||
return vk_mem_lookup(addr, n, &sp) && !sp.alloc && sp.pool && sp.avail >= n &&
|
||||
(sp.cls == VK_MCLS_HOST_CACHED || sp.cls == VK_MCLS_HOST_UNC);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user