Merge branch 'master' into vulkan

2022-05-03 00:13:17 +03:00
parent 47799163bd 0fd578cafd
commit b88f715140
112 changed files with 26403 additions and 1451 deletions
--- a/src/xenia/ui/d3d12/d3d12_util.cc
+++ b/src/xenia/ui/d3d12/d3d12_util.cc
@@ -134,7 +134,6 @@ void GetFormatCopyInfo(DXGI_FORMAT format, uint32_t plane,
  DXGI_FORMAT copy_format = format;
  uint32_t block_width = 1;
  uint32_t block_height = 1;
-  bool divide_by_block_size = false;
  uint32_t bytes_per_block = 1;
  switch (format) {
    case DXGI_FORMAT_R32G32B32A32_TYPELESS:
--- a/src/xenia/ui/windowed_app_context_android.cc
+++ b/src/xenia/ui/windowed_app_context_android.cc
@@ -336,6 +336,7 @@ void AndroidWindowedAppContext::Shutdown() {
    ui_thread_looper_ = nullptr;
  }

+  activity_method_post_invalidate_window_surface_ = nullptr;
  activity_method_finish_ = nullptr;
  if (activity_) {
    ui_thread_jni_env_->DeleteGlobalRef(activity_);