Compare commits

...

4 Commits

Author SHA1 Message Date
oltolm
967987b25f GS, UI: use u32 instead of s32 for width and height 2026-01-07 14:15:00 +01:00
PCSX2 Bot
e41f63b821 [ci skip] Qt: Update Base Translation. 2026-01-07 01:03:59 +01:00
SilentHeII
0f82503cf7 GameDB: Added various memory card filters
Reads Twisted Metal Black for bonus unlockable.

Adds memcardFilters for Shadow Hearts: Covenant

Ignore my previous pull request. I have no idea why it formatted it so obnoxiously.

Anyway, you get extra ingame items if you have a save file from Shadow Hearts 1.

GameIndex changes

Added memcardFilters for Biohazard Outbreak & Biohazard Outbreak File 2 to allow for creation of network configurations.

Added missing titles

Added missing titles to allow games to load their own saves.
2026-01-06 20:56:26 +01:00
Christopher Obbard
33f625a4e2 cmake: only require Qt modules when Qt UI is enabled
The Qt6 CorePrivate/GuiPrivate/WidgetsPrivate components are only needed
for the Qt UI build. Move their find_package() call under ENABLE_QT_UI
to avoid requiring private Qt modules when building without the UI.

Signed-off-by: Christopher Obbard <obbardc@gmail.com>
2026-01-06 20:44:35 +01:00
21 changed files with 199 additions and 64 deletions

View File

@@ -11384,6 +11384,10 @@ SCUS-97197:
name: "War of the Monsters"
region: "NTSC-U"
compat: 5
memcardFilters: # Reads Twisted Metal Black for bonus unlockable.
- "SCUS-97101"
- "SCUS-97179"
- "SCUS-97197"
SCUS-97198:
name: "Sly Cooper and the Thievius Raccoonus"
region: "NTSC-U"
@@ -30583,6 +30587,11 @@ SLES-82030:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLES-82030"
- "SLES-82031"
- "SLES-50677"
- "SLES-50822"
SLES-82031:
name: "Shadow Hearts - Covenant [Disc 2 of 2]"
region: "PAL-M3"
@@ -30590,8 +30599,11 @@ SLES-82031:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters:
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLES-82030"
- "SLES-82031"
- "SLES-50677"
- "SLES-50822"
SLES-82032:
name: "Metal Gear Solid 3 - Snake Eater"
region: "PAL-G"
@@ -43473,6 +43485,11 @@ SLPM-65428:
name-en: "BioHazard Outbreak"
region: "NTSC-J"
compat: 5
memcardFilters:
- "SLPM-65428"
- "SLPM-74201"
- "SLPM-65286"
- "BWNETCNF"
SLPM-65429:
name: "ギャラクシーエンジェル Moonlit Lovers [初回限定版ファーストパッケージ]"
name-sort: "ぎゃらくしーえんじぇる Moonlit Lovers [しょかいげんていばんふぁーすとぱっけーじ]"
@@ -44973,6 +44990,8 @@ SLPM-65692:
- "SLPM-65692"
- "SLPM-65428"
- "SLPM-74201"
- "SLPM-65286"
- "BWNETCNF"
SLPM-65693:
name: "ときめきメモリアル3 ~約束のあの場所で~ [コナミ殿堂セレクション]"
name-sort: "ときめきめもりある3 やくそくのあのばしょで [こなみでんどうせれくしょん]"
@@ -53680,6 +53699,11 @@ SLPM-74201:
name-sort: "ばいおはざーど あうとぶれいく [PlayStation2 the Best]"
name-en: "BioHazard Outbreak [PlayStation2 the Best]"
region: "NTSC-J"
memcardFilters:
- "SLPM-65428"
- "SLPM-74201"
- "SLPM-65286"
- "BWNETCNF"
SLPM-74202:
name: "風雲 新撰組 [PlayStation2 the Best]"
name-sort: "ふううん しんせんぐみ [PlayStation2 the Best]"
@@ -58845,6 +58869,11 @@ SLPS-25317:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-25317"
- "SLPS-25318"
- "SLPS-25041"
- "SLPS-73418"
SLPS-25318:
name: "シャドウハーツⅡ [DXパック] [ディスク2/2]"
name-sort: "しゃどうはーつ2 [DXぱっく] [でぃすく2/2]"
@@ -58854,8 +58883,11 @@ SLPS-25318:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters:
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-25317"
- "SLPS-25318"
- "SLPS-25041"
- "SLPS-73418"
SLPS-25319:
name: "ケロケロキング スーパーDX"
name-sort: "けろけろきんぐ すーぱーDX"
@@ -58934,6 +58966,11 @@ SLPS-25334:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-25334"
- "SLPS-25335"
- "SLPS-25041"
- "SLPS-73418"
SLPS-25335:
name: "シャドウハーツⅡ [通常版] [ディスク2/2]"
name-sort: "しゃどうはーつ2 [つうじょうばん] [でぃすく2/2]"
@@ -58943,8 +58980,11 @@ SLPS-25335:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters:
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-25334"
- "SLPS-25335"
- "SLPS-25041"
- "SLPS-73418"
SLPS-25336:
name: "バスランディング3 [Sammy best] [つりコン2+ 同梱版]"
name-sort: "ばすらんでぃんぐ3 [Sammy best] [つりこん2 どうこんばん]"
@@ -63242,6 +63282,11 @@ SLPS-73214:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-73214"
- "SLPS-73215"
- "SLPS-25041"
- "SLPS-73418"
SLPS-73215:
name: "シャドウハーツⅡ ディレクターズカット [PlayStation2 the Best] [ディスク2/2]"
name-sort: "しゃどうはーつ2 でぃれくたーずかっと [PlayStation2 the Best] [でぃすく2/2]"
@@ -63251,8 +63296,11 @@ SLPS-73215:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters:
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLPS-73214"
- "SLPS-73215"
- "SLPS-25041"
- "SLPS-73418"
SLPS-73216:
name: "マグナカルタ [PlayStation2 the Best]"
name-sort: "まぐなかるた [PlayStation2 the Best]"
@@ -69321,6 +69369,10 @@ SLUS-21041:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLUS-21041"
- "SLUS-21044"
- "SLUS-20347"
SLUS-21042:
name: "Darkwatch"
region: "NTSC-U"
@@ -69339,8 +69391,10 @@ SLUS-21044:
halfPixelOffset: 5 # Fixes shadow positioning.
autoFlush: 2 # Makes the shadow monsters appear.
nativeScaling: 2 # Aligns post processing and bloom.
memcardFilters:
memcardFilters: # Reads Shadow Hearts for extra items.
- "SLUS-21041"
- "SLUS-21044"
- "SLUS-20347"
SLUS-21045:
name: "Conflict - Vietnam"
region: "NTSC-U"

View File

@@ -109,14 +109,14 @@ disable_compiler_warnings_for_target(speex)
# Find the Qt components that we need.
if(ENABLE_QT_UI)
find_package(Qt6 6.10.0 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
endif()
if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
endif()
if (Qt6_VERSION VERSION_GREATER_EQUAL 6.10.0)
find_package(Qt6 COMPONENTS CorePrivate GuiPrivate WidgetsPrivate REQUIRED)
endif()
# The docking system for the debugger.
# The docking system for the debugger.
find_package(KDDockWidgets-qt6 2.3.0 REQUIRED)
endif()
if(WIN32)
add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)

View File

@@ -37,7 +37,7 @@ public:
void restoreGeometry(const QByteArray& geometry);
Q_SIGNALS:
void windowResizedEvent(int width, int height, float scale);
void windowResizedEvent(u32 width, u32 height, float scale);
void windowRestoredEvent();
void dragEnterEvent(QDragEnterEvent* event);

View File

@@ -777,7 +777,7 @@ void EmuThread::connectDisplaySignals(DisplaySurface* widget)
connect(widget, &DisplaySurface::windowRestoredEvent, this, &EmuThread::redrawDisplayWindow);
}
void EmuThread::onDisplayWindowResized(int width, int height, float scale)
void EmuThread::onDisplayWindowResized(u32 width, u32 height, float scale)
{
if (!MTGS::IsOpen())
return;

View File

@@ -191,7 +191,7 @@ private:
private Q_SLOTS:
void stopInThread();
void doBackgroundControllerPoll();
void onDisplayWindowResized(int width, int height, float scale);
void onDisplayWindowResized(u32 width, u32 height, float scale);
void onApplicationStateChanged(Qt::ApplicationState state);
void redrawDisplayWindow();

View File

@@ -23147,8 +23147,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="938"/>
<location filename="../../pcsx2/USB/usb-pad/usb-realplay.cpp" line="448"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="373"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="79"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="98"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="89"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="108"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="131"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="440"/>
<source>D-Pad Up</source>
<translation type="unfinished"></translation>
@@ -23160,8 +23161,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="940"/>
<location filename="../../pcsx2/USB/usb-pad/usb-realplay.cpp" line="449"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="374"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="80"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="99"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="90"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="109"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="132"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="441"/>
<source>D-Pad Down</source>
<translation type="unfinished"></translation>
@@ -23173,8 +23175,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="941"/>
<location filename="../../pcsx2/USB/usb-pad/usb-realplay.cpp" line="450"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="375"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="81"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="100"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="91"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="110"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="133"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="442"/>
<source>D-Pad Left</source>
<translation type="unfinished"></translation>
@@ -23186,8 +23189,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="939"/>
<location filename="../../pcsx2/USB/usb-pad/usb-realplay.cpp" line="451"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="376"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="82"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="101"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="92"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="111"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="134"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="443"/>
<source>D-Pad Right</source>
<translation type="unfinished"></translation>
@@ -23211,6 +23215,7 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-lightgun/guncon2.cpp" line="592"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="139"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="363"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="154"/>
<source>A</source>
<translation type="unfinished"></translation>
</message>
@@ -23218,12 +23223,14 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-lightgun/guncon2.cpp" line="593"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="140"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="364"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="155"/>
<source>B</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-lightgun/guncon2.cpp" line="594"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="365"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="156"/>
<source>C</source>
<translation type="unfinished"></translation>
</message>
@@ -23234,8 +23241,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="936"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="1003"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="371"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="87"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="107"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="97"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="117"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="141"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="448"/>
<source>Select</source>
<translation type="unfinished"></translation>
@@ -23247,8 +23255,9 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="937"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="1002"/>
<location filename="../../pcsx2/USB/usb-pad/usb-seamic.cpp" line="372"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="88"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="108"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="98"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="118"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="142"/>
<location filename="../../pcsx2/USB/usb-pad/usb-turntable.cpp" line="449"/>
<source>Start</source>
<translation type="unfinished"></translation>
@@ -23576,8 +23585,8 @@ Rename it to {} to remove this warning.</source>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="77"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="105"/>
<location filename="../../pcsx2/USB/usb-pad/usb-pad.cpp" line="134"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="78"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="97"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="88"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="107"/>
<source>Brake</source>
<translation type="unfinished"></translation>
</message>
@@ -24351,66 +24360,138 @@ Xbox 360 turntables require a 256x multiplier, most other turntables can use the
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="77"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="96"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="40"/>
<source>Train Mascon</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="41"/>
<source>Master Controller</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="87"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="106"/>
<source>Power</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="83"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="93"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="138"/>
<source>A Button</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="84"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="94"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="139"/>
<source>B Button</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="85"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="95"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="140"/>
<source>C Button</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="86"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="96"/>
<source>D Button</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="102"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="112"/>
<source>Announce</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="103"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="113"/>
<source>Horn</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="104"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="114"/>
<source>Left Door</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="105"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="115"/>
<source>Right Door</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="106"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="116"/>
<source>Camera Button</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="162"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="126"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="149"/>
<source>Power Up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="127"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="150"/>
<source>Power Down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="128"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="151"/>
<source>Reverser Up</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="129"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="152"/>
<source>Reverser Down</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="136"/>
<source>ATS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="137"/>
<source>Close</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="153"/>
<source>S</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="227"/>
<source>Axes Passthrough</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="163"/>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="228"/>
<source>Passes through the unprocessed input axis to the game. Enable if you are using a compatible Densha De Go! controller. Disable if you are using any other joystick.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="240"/>
<source>Power notches</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="241"/>
<source>Selects the number of power notches (3-6)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="249"/>
<source>Brake notches</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../../pcsx2/USB/usb-pad/usb-train.cpp" line="250"/>
<source>Selects the number of brake notches (5-8)</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>USBBindingWidget</name>

View File

@@ -533,7 +533,7 @@ bool GSHasDisplayWindow()
return (g_gs_device->GetWindowInfo().type != WindowInfo::Type::Surfaceless);
}
void GSResizeDisplayWindow(int width, int height, float scale)
void GSResizeDisplayWindow(u32 width, u32 height, float scale)
{
g_gs_device->ResizeWindow(width, height, scale);
ImGuiManager::WindowResized();

View File

@@ -83,7 +83,7 @@ void GSThrottlePresentation();
void GSGameChanged();
void GSSetDisplayAlignment(GSDisplayAlignment alignment);
bool GSHasDisplayWindow();
void GSResizeDisplayWindow(int width, int height, float scale);
void GSResizeDisplayWindow(u32 width, u32 height, float scale);
void GSUpdateDisplayWindow();
void GSSetVSyncMode(GSVSyncMode mode, bool allow_present_throttle);

View File

@@ -1019,7 +1019,7 @@ public:
virtual bool UpdateWindow() = 0;
/// Call when the window size changes externally to recreate any resources.
virtual void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) = 0;
virtual void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) = 0;
/// Returns true if exclusive fullscreen is supported.
virtual bool SupportsExclusiveFullscreen() const = 0;

View File

@@ -278,7 +278,7 @@ bool GSDevice11::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
for (size_t i = 0; i < std::size(m_merge.ps); i++)
{
const std::string entry_point(StringUtil::StdStringFromFormat("ps_main%d", i));
const std::string entry_point(StringUtil::StdStringFromFormat("ps_main%zu", i));
m_merge.ps[i] = m_shader_cache.GetPixelShader(m_dev.get(), *shader, nullptr, entry_point.c_str());
if (!m_merge.ps[i])
return false;
@@ -312,7 +312,7 @@ bool GSDevice11::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
return false;
for (size_t i = 0; i < std::size(m_interlace.ps); i++)
{
const std::string entry_point(StringUtil::StdStringFromFormat("ps_main%d", i));
const std::string entry_point(StringUtil::StdStringFromFormat("ps_main%zu", i));
m_interlace.ps[i] = m_shader_cache.GetPixelShader(m_dev.get(), *shader, nullptr, entry_point.c_str());
if (!m_interlace.ps[i])
return false;
@@ -498,7 +498,7 @@ bool GSDevice11::Create(GSVSyncMode vsync_mode, bool allow_present_throttle)
for (size_t i = 0; i < std::size(m_date.primid_init_ps); i++)
{
const std::string entry_point(StringUtil::StdStringFromFormat("ps_stencil_image_init_%d", i));
const std::string entry_point(StringUtil::StdStringFromFormat("ps_stencil_image_init_%zu", i));
m_date.primid_init_ps[i] = m_shader_cache.GetPixelShader(m_dev.get(), *convert_hlsl, nullptr, entry_point.c_str());
if (!m_date.primid_init_ps[i])
return false;
@@ -893,7 +893,7 @@ std::string GSDevice11::GetDriverInfo() const
return ret;
}
void GSDevice11::ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale)
void GSDevice11::ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale)
{
if (!m_swap_chain || m_is_exclusive_fullscreen)
return;

View File

@@ -273,7 +273,7 @@ public:
RenderAPI GetRenderAPI() const override;
bool UpdateWindow() override;
void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) override;
void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) override;
bool SupportsExclusiveFullscreen() const override;
bool HasSurface() const override;
void DestroySurface() override;

View File

@@ -1054,7 +1054,7 @@ std::string GSDevice12::GetDriverInfo() const
return ret;
}
void GSDevice12::ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale)
void GSDevice12::ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale)
{
if (!m_swap_chain)
return;

View File

@@ -407,7 +407,7 @@ public:
void Destroy() override;
bool UpdateWindow() override;
void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) override;
void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) override;
bool SupportsExclusiveFullscreen() const override;
void DestroySurface() override;
std::string GetDriverInfo() const override;

View File

@@ -385,7 +385,7 @@ public:
bool SupportsExclusiveFullscreen() const override;
std::string GetDriverInfo() const override;
void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) override;
void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) override;
void UpdateTexture(id<MTLTexture> texture, u32 x, u32 y, u32 width, u32 height, const void* data, u32 data_stride);

View File

@@ -1267,11 +1267,11 @@ std::string GSDeviceMTL::GetDriverInfo() const
return desc;
}}
void GSDeviceMTL::ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale)
void GSDeviceMTL::ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale)
{
m_window_info.surface_scale = new_window_scale;
if (!m_layer ||
(m_window_info.surface_width == static_cast<u32>(new_window_width) && m_window_info.surface_height == static_cast<u32>(new_window_height)))
(m_window_info.surface_width == new_window_width && m_window_info.surface_height == new_window_height))
{
return;
}

View File

@@ -888,17 +888,17 @@ bool GSDeviceOGL::UpdateWindow()
return true;
}
void GSDeviceOGL::ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale)
void GSDeviceOGL::ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale)
{
m_window_info.surface_scale = new_window_scale;
if (m_window_info.type == WindowInfo::Type::Surfaceless ||
(m_window_info.surface_width == static_cast<u32>(new_window_width) &&
m_window_info.surface_height == static_cast<u32>(new_window_height)))
(m_window_info.surface_width == new_window_width &&
m_window_info.surface_height == new_window_height))
{
return;
}
m_gl_context->ResizeSurface(static_cast<u32>(new_window_width), static_cast<u32>(new_window_height));
m_gl_context->ResizeSurface(new_window_width, new_window_height);
m_window_info = m_gl_context->GetWindowInfo();
}

View File

@@ -297,7 +297,7 @@ public:
void Destroy() override;
bool UpdateWindow() override;
void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) override;
void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) override;
bool SupportsExclusiveFullscreen() const override;
void DestroySurface() override;
std::string GetDriverInfo() const override;

View File

@@ -2216,12 +2216,12 @@ bool GSDeviceVK::UpdateWindow()
return true;
}
void GSDeviceVK::ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale)
void GSDeviceVK::ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale)
{
m_resize_requested = false;
if (!m_swap_chain || (m_swap_chain->GetWidth() == static_cast<u32>(new_window_width) &&
m_swap_chain->GetHeight() == static_cast<u32>(new_window_height)))
if (!m_swap_chain || (m_swap_chain->GetWidth() == new_window_width &&
m_swap_chain->GetHeight() == new_window_height))
{
// skip unnecessary resizes
m_window_info.surface_scale = new_window_scale;

View File

@@ -506,7 +506,7 @@ public:
void Destroy() override;
bool UpdateWindow() override;
void ResizeWindow(s32 new_window_width, s32 new_window_height, float new_window_scale) override;
void ResizeWindow(u32 new_window_width, u32 new_window_height, float new_window_scale) override;
bool SupportsExclusiveFullscreen() const override;
void DestroySurface() override;
std::string GetDriverInfo() const override;

View File

@@ -946,7 +946,7 @@ void MTGS::ApplySettings()
WaitGS(false, false, false);
}
void MTGS::ResizeDisplayWindow(int width, int height, float scale)
void MTGS::ResizeDisplayWindow(u32 width, u32 height, float scale)
{
pxAssertRel(IsOpen(), "MTGS is running");
RunOnGSThread([width, height, scale]() {

View File

@@ -69,7 +69,7 @@ namespace MTGS
void RunOnGSThread(AsyncCallType func);
void GameChanged();
void ApplySettings();
void ResizeDisplayWindow(int width, int height, float scale);
void ResizeDisplayWindow(u32 width, u32 height, float scale);
void UpdateDisplayWindow();
void SetVSyncMode(GSVSyncMode mode, bool allow_present_throttle);
void UpdateVSyncMode();