mirror of
https://github.com/hrydgard/ppsspp.git
synced 2026-11-15 02:29:51 +01:00
Changes to make use of the dual atlas mode
Merge branch 'master' into TemporaryHackishBranch # Conflicts: # CMakeLists.txt # Common/UI/Context.cpp # Core/Config.cpp # GPU/D3D11/TextureCacheD3D11.cpp # GPU/Directx9/TextureCacheDX9.cpp # GPU/GLES/TextureCacheGLES.cpp # GPU/Vulkan/TextureCacheVulkan.cpp # README.md # UI/GameSettingsScreen.cpp # UI/MainScreen.cpp # UI/NativeApp.cpp # android/assets/ui_atlas.meta # android/assets/ui_atlas.zim # assets/ui_atlas.meta # assets/ui_atlas.zim
This commit is contained in:
commit
d60b332536
338 files changed
+14129
-6426
No files matched your search
@@ -233,10 +233,6 @@ namespace MainWindow
|
||||
g_Config.iInternalResolution = 0;
|
||||
}
|
||||
|
||||
// Taking auto-texture scaling into account
|
||||
if (g_Config.iTexScalingLevel == TEXSCALING_AUTO)
|
||||
setTexScalingMultiplier(0);
|
||||
|
||||
NativeMessageReceived("gpu_resized", "");
|
||||
}
|
||||
|
||||
@@ -768,7 +764,7 @@ namespace MainWindow
|
||||
if (disasmWindow)
|
||||
SendMessage(disasmWindow->GetDlgHandle(), WM_COMMAND, IDC_STOPGO, 0);
|
||||
else
|
||||
Core_EnableStepping(pause);
|
||||
Core_EnableStepping(pause, "ui.lost_focus", 0);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user