VERY experimental Nintendo Switch 2 emulator
C++
Merge pull request #10476 from ameerj/gl-memory-maps
liamwhite93372f503a40
diff --cc src/video_core/buffer_cache/buffer_cache.hindex f1ad5f7cbe,08bc66aaa6..2f281b3705--- a/src/video_core/buffer_cache/buffer_cache.h+++ b/src/video_core/buffer_cache/buffer_cache.h@@@ -685,13 -670,13 +683,13 @@@ bool BufferCache<P>::IsRegionCpuModifietemplate <class P>void BufferCache<P>::BindHostIndexBuffer() {- Buffer& buffer = slot_buffers[index_buffer.buffer_id];- TouchBuffer(buffer, index_buffer.buffer_id);- const u32 offset = buffer.Offset(index_buffer.cpu_addr);- const u32 size = index_buffer.size;+ Buffer& buffer = slot_buffers[channel_state->index_buffer.buffer_id];+ TouchBuffer(buffer, channel_state->index_buffer.buffer_id);+ const u32 offset = buffer.Offset(channel_state->index_buffer.cpu_addr);+ const u32 size = channel_state->index_buffer.size;const auto& draw_state = maxwell3d->draw_manager->GetDrawState();if (!draw_state.inline_index_draw_indexes.empty()) [[unlikely]] {- if constexpr (USE_MEMORY_MAPS) {+ if constexpr (USE_MEMORY_MAPS_FOR_UPLOADS) {auto upload_staging = runtime.UploadStagingBuffer(size);std::array<BufferCopy, 1> copies{{BufferCopy{.src_offset = upload_staging.offset, .dst_offset = 0, .size = size}}};diff --cc src/video_core/buffer_cache/buffer_cache_base.hindex c689fe06bd,7c6ef49d51..60a1f285ed--- a/src/video_core/buffer_cache/buffer_cache_base.h+++ b/src/video_core/buffer_cache/buffer_cache_base.h@@@ -173,7 -103,10 +173,8 @@@ class BufferCache : public VideoCommon:static constexpr bool USE_MEMORY_MAPS = P::USE_MEMORY_MAPS;static constexpr bool SEPARATE_IMAGE_BUFFERS_BINDINGS = P::SEPARATE_IMAGE_BUFFER_BINDINGS;static constexpr bool IMPLEMENTS_ASYNC_DOWNLOADS = P::IMPLEMENTS_ASYNC_DOWNLOADS;+ static constexpr bool USE_MEMORY_MAPS_FOR_UPLOADS = P::USE_MEMORY_MAPS_FOR_UPLOADS;- static constexpr BufferId NULL_BUFFER_ID{0};-static constexpr s64 DEFAULT_EXPECTED_MEMORY = 512_MiB;static constexpr s64 DEFAULT_CRITICAL_MEMORY = 1_GiB;static constexpr s64 TARGET_THRESHOLD = 4_GiB;