From db63269e15bf1fcaed4ee8a5396dbf6c6bd8a659 Mon Sep 17 00:00:00 2001
From: pineappleEA <pineaea@gmail.com>
Date: Wed, 7 Apr 2021 07:53:08 +0200
Subject: [PATCH] early-access version 1560

---
 README.md                                     |  2 +-
 src/core/CMakeLists.txt                       |  2 +-
 src/video_core/command_classes/codecs/vp9.cpp | 16 +++++++++-------
 src/yuzu/configuration/configure_graphics.ui  |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index e80e9dbfa..d31440d00 100755
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 yuzu emulator early access
 =============
 
-This is the source code for early-access 1559.
+This is the source code for early-access 1560.
 
 ## Legal Notice
 
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index a81d30032..5aa833d46 100755
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -271,9 +271,9 @@ add_library(core STATIC
     hle/service/am/applets/general_backend.h
     hle/service/am/applets/profile_select.cpp
     hle/service/am/applets/profile_select.h
-    hle/service/am/applets/software_keyboard_types.h
     hle/service/am/applets/software_keyboard.cpp
     hle/service/am/applets/software_keyboard.h
+    hle/service/am/applets/software_keyboard_types.h
     hle/service/am/applets/web_browser.cpp
     hle/service/am/applets/web_browser.h
     hle/service/am/applets/web_types.h
diff --git a/src/video_core/command_classes/codecs/vp9.cpp b/src/video_core/command_classes/codecs/vp9.cpp
index 59e586695..29bb31418 100755
--- a/src/video_core/command_classes/codecs/vp9.cpp
+++ b/src/video_core/command_classes/codecs/vp9.cpp
@@ -2,8 +2,9 @@
 // Licensed under GPLv2 or any later version
 // Refer to the license.txt file included.
 
-#include <cstring> // for std::memcpy
+#include <algorithm> // for std::copy
 #include <numeric>
+#include "common/assert.h"
 #include "video_core/command_classes/codecs/vp9.h"
 #include "video_core/gpu.h"
 #include "video_core/memory_manager.h"
@@ -362,7 +363,8 @@ Vp9PictureInfo VP9::GetVp9PictureInfo(const NvdecCommon::NvdecRegisters& state)
     // surface_luma_offset[0:3] contains the address of the reference frame offsets in the following
     // order: last, golden, altref, current. It may be worthwhile to track the updates done here
     // to avoid buffering frame data needed for reference frame updating in the header composition.
-    std::memcpy(vp9_info.frame_offsets.data(), state.surface_luma_offset.data(), 4 * sizeof(u64));
+    std::copy(state.surface_luma_offset.begin(), state.surface_luma_offset.begin() + 4,
+              vp9_info.frame_offsets.begin());
 
     return vp9_info;
 }
@@ -821,11 +823,11 @@ const std::vector<u8>& VP9::ComposeFrameHeader(const NvdecCommon::NvdecRegisters
 
     // Write headers and frame to buffer
     frame.resize(uncompressed_header.size() + compressed_header.size() + bitstream.size());
-    std::memcpy(frame.data(), uncompressed_header.data(), uncompressed_header.size());
-    std::memcpy(frame.data() + uncompressed_header.size(), compressed_header.data(),
-                compressed_header.size());
-    std::memcpy(frame.data() + uncompressed_header.size() + compressed_header.size(),
-                bitstream.data(), bitstream.size());
+    std::copy(uncompressed_header.begin(), uncompressed_header.end(), frame.begin());
+    std::copy(compressed_header.begin(), compressed_header.end(),
+              frame.begin() + uncompressed_header.size());
+    std::copy(bitstream.begin(), bitstream.end(),
+              frame.begin() + uncompressed_header.size() + compressed_header.size());
 
     // keep track of frame number
     current_frame_number++;
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 116915efd..ab0bd4d77 100755
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -130,7 +130,7 @@
             <widget class="QComboBox" name="fullscreen_mode_combobox">
              <item>
               <property name="text">
-               <string>Borderless Windowed (Default)</string>
+               <string>Borderless Windowed</string>
               </property>
              </item>
              <item>