Merge upstream Djihads80/Eglantine nx2 into nx2HEADnx2

# Conflicts:
#	.github/workflows/release-binaries.yml

1 files changed, 10 insertions, 0 deletions

diff --git a/src/tests/video_core/descriptor_table.cpp b/src/tests/video_core/descriptor_table.cpp
index 8b20564949..1f0f374e23 100644
--- a/src/tests/video_core/descriptor_table.cpp
+++ b/src/tests/video_core/descriptor_table.cpp
@@ -13,6 +13,12 @@ namespace {
 struct DescriptorMemory {
     std::array<std::array<u64, 128>, 2> banks{};
 
+    // DescriptorTable::Read prefers a single-page host pointer when the memory manager offers one;
+    // these tests are about the invalidation bookkeeping on the generic read path.
+    const u8* GetPointer(GPUVAddr) const {
+        return nullptr;
+    }
+
     void ReadBlockUnsafe(GPUVAddr address, void* output, size_t size) const {
         const auto bank = (address - 0x1000) / 0x1000;
         const auto offset = (address - 0x1000) % 0x1000;
@@ -100,6 +106,10 @@ TEST_CASE("Repeated image deletion cannot reuse stale descriptor view IDs", "[de
 
 TEST_CASE("Descriptor limits clear exposed slots after shrink and growth", "[descriptor_table]") {
     struct AddressMemory {
+        const u8* GetPointer(GPUVAddr) const {
+            return nullptr;
+        }
+
         void ReadBlockUnsafe(GPUVAddr address, void* output, size_t size) const {
             std::memcpy(output, &address, size);
         }