mirror
/
pcsx2
mirror of https://github.com/987123879113/pcsx2
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
pull/12/head
987123879113 12 months ago
parent 08d269e3e7 ce412686b9
commit 6d40d9fb94
84 changed files with 1518 additions and 1717 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      bin/PCSX2_keys.ini.default
  2. 156
      bin/resources/GameIndex.yaml
  3. 19
      bin/resources/game_controller_db.txt
  4. 2
      bin/resources/shaders/common/ffx_cas.h
  5. 24
      bin/resources/shaders/common/fxaa.fx
  6. 4
      bin/resources/shaders/opengl/common_header.glsl
  7. 28
      bin/resources/shaders/opengl/convert.glsl
  8. 44
      bin/resources/shaders/opengl/interlace.glsl
  9. 11
      bin/resources/shaders/opengl/present.glsl
  10. 36
      bin/resources/shaders/opengl/tfx_fs.glsl
  11. 16
      bin/resources/shaders/opengl/tfx_vgs.glsl
  12. 7
      common/D3D12/Context.cpp
  13. 15
      common/GL/StreamBuffer.cpp
  14. 3
      common/GL/StreamBuffer.h
  15. 24
      pcsx2-gsrunner/Main.cpp
  16. 15
      pcsx2-qt/GameList/GameListWidget.cpp
  17. 3
      pcsx2-qt/GameList/GameListWidget.h
  18. 179
      pcsx2-qt/MainWindow.cpp
  19. 19
      pcsx2-qt/MainWindow.h
  20. 130
      pcsx2-qt/QtHost.cpp
  21. 2
      pcsx2-qt/QtHost.h
  22. 82
      pcsx2-qt/Settings/GameSummaryWidget.cpp
  23. 7
      pcsx2-qt/Settings/GameSummaryWidget.h
  24. 58
      pcsx2-qt/Settings/GameSummaryWidget.ui
  25. 6
      pcsx2-qt/Settings/GraphicsSettingsWidget.cpp
  26. 21
      pcsx2-qt/Settings/GraphicsSettingsWidget.ui
  27. 16
      pcsx2-qt/Settings/SettingsDialog.cpp
  28. 1
      pcsx2-qt/Settings/SettingsDialog.h
  29. 49
      pcsx2/CDVD/CDVD.cpp
  30. 1
      pcsx2/CDVD/CDVD.h
  31. 19
      pcsx2/CDVD/CDVD_internal.h
  32. 2
      pcsx2/CMakeLists.txt
  33. 3
      pcsx2/Frontend/CommonHost.cpp
  34. 3
      pcsx2/Frontend/CommonHost.h
  35. 66
      pcsx2/Frontend/FullscreenUI.cpp
  36. 442
      pcsx2/Frontend/GameList.cpp
  37. 3
      pcsx2/Frontend/GameList.h
  38. 12
      pcsx2/Frontend/ImGuiManager.cpp
  39. 166
      pcsx2/GS/GS.cpp
  40. 1
      pcsx2/GS/GS.h
  41. 17
      pcsx2/GS/GSClut.cpp
  42. 7
      pcsx2/GS/GSCodeBuffer.cpp
  43. 7
      pcsx2/GS/GSExtra.h
  44. 4
      pcsx2/GS/GSGL.h
  45. 25
      pcsx2/GS/GSLocalMemory.cpp
  46. 3
      pcsx2/GS/GSLocalMemory.h
  47. 5
      pcsx2/GS/GSRingHeap.cpp
  48. 41
      pcsx2/GS/Renderers/Common/GSDevice.cpp
  49. 1
      pcsx2/GS/Renderers/Common/GSDevice.h
  50. 36
      pcsx2/GS/Renderers/Common/GSRenderer.cpp
  51. 3
      pcsx2/GS/Renderers/DX11/GSDevice11.cpp
  52. 4
      pcsx2/GS/Renderers/DX12/GSDevice12.cpp
  53. 2
      pcsx2/GS/Renderers/HW/GSRendererHW.cpp
  54. 178
      pcsx2/GS/Renderers/OpenGL/GLLoader.cpp
  55. 13
      pcsx2/GS/Renderers/OpenGL/GLLoader.h
  56. 1
      pcsx2/GS/Renderers/OpenGL/GLState.cpp
  57. 1
      pcsx2/GS/Renderers/OpenGL/GLState.h
  58. 417
      pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.cpp
  59. 30
      pcsx2/GS/Renderers/OpenGL/GSDeviceOGL.h
  60. 300
      pcsx2/GS/Renderers/OpenGL/GSTextureOGL.cpp
  61. 38
      pcsx2/GS/Renderers/OpenGL/GSTextureOGL.h
  62. 88
      pcsx2/GS/Renderers/OpenGL/GSUniformBufferOGL.h
  63. 10
      pcsx2/GS/Renderers/SW/GSRasterizer.cpp
  64. 1
      pcsx2/GS/Renderers/Vulkan/GSDeviceVK.cpp
  65. 3
      pcsx2/GS/Window/GSSetting.cpp
  66. 1
      pcsx2/GS/Window/GSSetting.h
  67. 1
      pcsx2/GS/Window/GSwxDialog.cpp
  68. 2
      pcsx2/GSDumpReplayer.cpp
  69. 1
      pcsx2/Pcsx2Config.cpp
  70. 13
      pcsx2/SPU2/Global.h
  71. 38
      pcsx2/SPU2/Host/Dialogs.cpp
  72. 2
      pcsx2/SPU2/SndOut.h
  73. 4
      pcsx2/SPU2/Wavedump_wav.cpp
  74. 94
      pcsx2/SPU2/spu2.cpp
  75. 9
      pcsx2/SPU2/spu2.h
  76. 78
      pcsx2/VMManager.cpp
  77. 13
      pcsx2/VMManager.h
  78. 10
      pcsx2/gui/FrameForGS.cpp
  79. 2
      pcsx2/gui/SysCoreThread.cpp
  80. 3
      pcsx2/pcsx2.vcxproj
  81. 5
      pcsx2/pcsx2.vcxproj.filters
  82. 4
      pcsx2/pcsx2core.vcxproj
  83. 6
      pcsx2/pcsx2core.vcxproj.filters
  84. 2
      pcsx2/x86/microVU_Misc.inl

17
bin/PCSX2_keys.ini.default
Unescape View File

@ -38,11 +38,6 @@ States_DefrostCurrentSlotBackup = Shift-F3
States_CycleSlotForward = F2
States_CycleSlotBackward = Shift-F2
Frameskip_Toggle = Shift-F4
Framelimiter_TurboToggle = TAB
Framelimiter_SlomoToggle = Shift-TAB
Framelimiter_MasterToggle = F4
FullscreenToggle = Alt-ENTER
# Note: toggles suspend, but can resume only if the GS window is not set to hide
@ -61,23 +56,11 @@ Sys_RecordingToggle = F12
GSwindow_CycleAspectRatio = F6
# Whole picture zoom in/out
GSwindow_ZoomIn = Ctrl-KP_ADD
GSwindow_ZoomOut = Ctrl-KP_SUBTRACT
GSwindow_ZoomToggle = Ctrl-KP_MULTIPLY
# Vertical stretch/squash
GSwindow_ZoomInY = Alt-Ctrl-KP_ADD
GSwindow_ZoomOutY = Alt-Ctrl-KP_SUBTRACT
GSwindow_ZoomResetY = Alt-Ctrl-KP_MULTIPLY
# Move the whole image
GSwindow_OffsetYminus = Alt-Ctrl-UP
GSwindow_OffsetYplus = Alt-Ctrl-DOWN
GSwindow_OffsetXminus = Alt-Ctrl-LEFT
GSwindow_OffsetXplus = Alt-Ctrl-RIGHT
GSwindow_OffsetReset = Alt-Ctrl-KP_DIVIDE
# Recording Bindings
# Note - These are disabled if 'System > Enable Recording Tools' is disabled
FrameAdvance = SPACE

156
bin/resources/GameIndex.yaml
Unescape View File

@ -581,6 +581,7 @@ SCAJ-20020:
eeClampMode: 3 # Characters are visible in-game.
gsHWFixes:
texturePreloading: 1 # Performs better with partial preload because it is slow on locations outside gameplay foremost.
mergeSprite: 1 # Fixes misaligned white lines.
SCAJ-20021:
name: "Metal Slug 3"
region: "NTSC-Unk"
@ -1584,7 +1585,6 @@ SCAJ-30010:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCAJ-30011:
name: "God of War II"
@ -2986,7 +2986,7 @@ SCES-50602:
name: "Monsters Inc."
region: "PAL-Unk"
SCES-50603:
name: "Monstruos, S.A. - La Isla de los Sustos"
name: "Monstruos, S.A. - Isla de los sustos"
region: "PAL-S"
SCES-50604:
name: "Monsters, Inc - Skrämmarön"
@ -3272,7 +3272,6 @@ SCES-51533:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCES-51578:
name: "Network Access Disc [v1.03 - v6.00]"
@ -3739,7 +3738,6 @@ SCES-53133:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCES-53178:
name: "SingStar Pop"
@ -4013,7 +4011,7 @@ SCES-53883:
gameFixes:
- EETimingHack # Fixes freezes.
SCES-53884:
name: "Buzz! The Big Quiz"
name: "Buzz! El GRAN Reto"
region: "PAL-S"
compat: 2
gameFixes:
@ -4167,7 +4165,7 @@ SCES-54261:
name: "Buzz! The Sports Quiz"
region: "PAL-I"
SCES-54262:
name: "Buzz! The Sports Quiz"
name: "Buzz! - El Gran Concurso de Deportes"
region: "PAL-S"
SCES-54263:
name: "Buzz! The Sports Quiz"
@ -4504,7 +4502,7 @@ SCES-55255:
name: "SingStar Singalong with Disney"
region: "PAL-E"
SCES-55256:
name: "SingStar Canciones Disney"
name: "SingStar canciones Disney"
region: "PAL-S"
SCES-55257:
name: "SingStar - Chansons Magiques de Disney"
@ -4603,7 +4601,7 @@ SCES-55521:
name: "SingStar SuomiPop"
region: "PAL-FI"
SCES-55527:
name: "SingStar 2009"
name: "SingStar Pop 2009"
region: "PAL-S"
SCES-55535:
name: "Desi Adda - Games of India"
@ -5272,7 +5270,6 @@ SCKA-30002:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCKA-30006:
name: "God of War 2"
@ -7857,7 +7854,6 @@ SCUS-97399:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCUS-97400:
name: "EyeToy - Groove"
@ -8147,7 +8143,6 @@ SCUS-97467:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SCUS-97468:
name: "EyeToy - Play 2"
@ -9853,17 +9848,17 @@ SLES-50225:
name: "Escape from Monkey Island"
region: "PAL-E"
SLES-50226:
name: "Escape from Monkey Island 4"
name: "Escape from Monkey Island"
region: "PAL-F"
SLES-50227:
name: "Flucht von Monkey Island"
region: "PAL-G"
compat: 5
SLES-50228:
name: "Escape from Monkey Island 4"
name: "Fuga da Monkey Island"
region: "PAL-I"
SLES-50229:
name: "Monkey Island 4"
name: "Fuga de Monkey Island, La"
region: "PAL-S"
SLES-50230:
name: "Lotus Challenge"
@ -10901,11 +10896,15 @@ SLES-50771:
name: "Blood Omen 2 - Legend of Kain"
region: "PAL-E"
compat: 5
roundModes:
eeRoundMode: 0 # Fixes pathing.
gsHWFixes:
mipmap: 1 # Fixes glitching textures.
SLES-50772:
name: "Blood Omen 2 - Legend of Kain"
region: "PAL-M3"
roundModes:
eeRoundMode: 0 # Fixes pathing.
gsHWFixes:
mipmap: 1 # Fixes glitching textures.
SLES-50773:
@ -11044,6 +11043,8 @@ SLES-50814:
SLES-50815:
name: "Blood Omen 2 - Legend of Kain"
region: "PAL-G"
roundModes:
eeRoundMode: 0 # Fixes pathing.
gsHWFixes:
mipmap: 1 # Fixes glitching textures.
SLES-50816:
@ -11136,14 +11137,14 @@ SLES-50836:
gsHWFixes:
textureInsideRT: 1
SLES-50837:
name: "Indiana Jones and The Emperor's Tomb"
name: "Indiana Jones et le Tombeau de L'Empereur"
region: "PAL-F"
gameFixes:
- EETimingHack # For texture flicker.
gsHWFixes:
textureInsideRT: 1
SLES-50838:
name: "Indiana Jones and The Emperor's Tomb"
name: "Indiana Jones und die Legende der Kaisergruft"
region: "PAL-G"
compat: 5
gameFixes:
@ -11151,14 +11152,14 @@ SLES-50838:
gsHWFixes:
textureInsideRT: 1
SLES-50839:
name: "Indiana Jones and The Emperor's Tomb"
name: "Indiana Jones e la Tomba dell'Imperatore"
region: "PAL-I"
gameFixes:
- EETimingHack # For texture flicker.
gsHWFixes:
textureInsideRT: 1
SLES-50840:
name: "Indiana Jones and The Emperor's Tomb"
name: "Indiana Jones y la Tumba del Emperador"
region: "PAL-S"
gameFixes:
- EETimingHack # For texture flicker.
@ -11514,7 +11515,7 @@ SLES-51026:
name: "Football Manager Campionato 2003"
region: "PAL-I"
SLES-51027:
name: "Mánager de Liga 2003"
name: "Manager de Liga 2003"
region: "PAL-S"
SLES-51038:
name: "MX Superfly featuring Ricky Carmichael"
@ -11873,7 +11874,7 @@ SLES-51194:
mipmap: 1
cpuFramebufferConversion: 1 # Fixes right side of the screen from garbage textures.
SLES-51195:
name: "Harry Potter y La Camara Secreta"
name: "Harry Potter y la Cámara Secreta"
region: "PAL-S"
gameFixes:
- EETimingHack # Fixes flickering textures.
@ -12081,17 +12082,17 @@ SLES-51253:
clampModes:
vuClampMode: 3 # Fix white shiny weapons.
SLES-51254:
name: "Der Herr der Ringe - Die Zwei Tuerme"
name: "Herr der Ringe, Der - Die Zwei Türme"
region: "PAL-G"
clampModes:
vuClampMode: 3 # Fix white shiny weapons.
SLES-51255:
name: "Lord of the Rings, The - The Two Towers"
name: "Signore Degli Anelli, Il - Le Due Torri"
region: "PAL-I"
clampModes:
vuClampMode: 3 # Fix white shiny weapons.
SLES-51256:
name: "El Senor de Los Anillos - Las Dos Torres"
name: "Señor de Los Anillos, El - Las Dos Torres"
region: "PAL-S"
compat: 5
clampModes:
@ -12328,13 +12329,13 @@ SLES-51358:
region: "PAL-E"
compat: 5
SLES-51360:
name: "Simpsons Skateboarding"
name: "Simpsons Skateboarding, The"
region: "PAL-I"
SLES-51361:
name: "Simpsons Skateboarding"
name: "Simpsons Skateboarding, The"
region: "PAL-S"
SLES-51362:
name: "Simpsons Skateboarding"
name: "Simpsons Skateboarding, The"
region: "PAL-G"
SLES-51363:
name: "Music 3000"
@ -12532,7 +12533,7 @@ SLES-51460:
name: "Football Manager 2004"
region: "PAL-I"
SLES-51461:
name: "Football Manager 2004"
name: "Manager de Liga 2004"
region: "PAL-S"
SLES-51462:
name: "Shrek Super Party"
@ -12840,7 +12841,7 @@ SLES-51665:
name: "Dynasty Warriors 4"
region: "PAL-S"
SLES-51666:
name: "Piglet's Big Game"
name: "Piglet - El Gran Juego de Disney"
region: "PAL-S"
SLES-51667:
name: "Piglet's Big Game"
@ -13270,7 +13271,7 @@ SLES-51853:
roundModes:
vuRoundMode: 0 # Crashes without.
SLES-51854:
name: "Tony Hawk Underground"
name: "Tony Hawk's Underground"
region: "PAL-S"
roundModes:
vuRoundMode: 0 # Crashes without.
@ -13280,6 +13281,9 @@ SLES-51855:
SLES-51856:
name: "Monster Attack"
region: "PAL-E"
gsHWFixes:
mipmap: 2 # Improves distant textures.
trilinearFiltering: 1 # Smooths high frequency textures on distant ground.
SLES-51859:
name: "Billiards Xciting"
region: "PAL-E"
@ -13675,16 +13679,16 @@ SLES-52017:
region: "PAL-M5"
compat: 5
SLES-52018:
name: "Der Herr der Ringe, Die Rueckkehr des Koenigs"
name: "Herr der Ringe, Der - Die Rückkehr des Königs"
region: "PAL-G"
SLES-52019:
name: "Lord of the Rings, The - Return of the King"
name: "Seigneur des Anneaux, Le - Le Retour du roi"
region: "PAL-F"
SLES-52020:
name: "Lord of the Rings, The - The Return of the King"
name: "Señor de Los Anillos, El - El Retorno del Rey"
region: "PAL-S"
SLES-52021:
name: "Lord of the Rings, The - The Return of the King"
name: "Signore degli Anelli, Il - Il Ritorno del Re"
region: "PAL-I"
SLES-52022:
name: "Total Club Manager 2004"
@ -13716,11 +13720,11 @@ SLES-52036:
region: "PAL-E"
compat: 5
SLES-52038:
name: "Terminator 3 - Rise of the Machines"
name: "Terminator 3 - Rebellion der Maschinen"
region: "PAL-G"
SLES-52039:
name: "Terminator 3 - La Rebelión de las Máquinas"
region: "PAL-S"
name: "Terminator 3 - Rise Of The Machines"
region: "PAL-IS"
SLES-52041:
name: "Detonator"
region: "PAL-E"
@ -14159,7 +14163,7 @@ SLES-52284:
name: "Deadly Skies III"
region: "PAL-M5"
SLES-52286:
name: "Tak and The Power of JuJu"
name: "Tak y el Poder Juju"
region: "PAL-S"
compat: 5
SLES-52287:
@ -14224,6 +14228,7 @@ SLES-52322:
eeClampMode: 3 # Characters are visible in-game.
gsHWFixes:
texturePreloading: 1 # Performs better with partial preload because it is slow on locations outside gameplay foremost.
mergeSprite: 1 # Fixes misaligned white lines.
SLES-52323:
name: "Richard Burns Rally"
region: "PAL-M5"
@ -15141,7 +15146,7 @@ SLES-52696:
name: "Football Manager Campionato 2005"
region: "PAL-I"
SLES-52697:
name: "Manager de la Liga 2005"
name: "Manager de Liga 2005"
region: "PAL-S"
SLES-52700:
name: "Adventures of Jimmy Neutron, The - Boy Genius - Attack of the Twonkies"
@ -15370,20 +15375,20 @@ SLES-52801:
gsHWFixes:
halfPixelOffset: 1 # Fixes ghosting in cutscenes.
SLES-52802:
name: "Lord of the Rings, The - The Third Age"
name: "Seigneur des anneaux, Le - Le Tiers Âge"
region: "PAL-F"
gsHWFixes:
halfPixelOffset: 1 # Fixes ghosting in cutscenes.
SLES-52803:
name: "Der Herr der Ringe - Das dritte Zeitalter"
name: "Herr der Ringe, Der - Das dritte Zeitalter"
region: "PAL-G"
SLES-52804:
name: "Lord of the Rings, The - The Third Age"
name: "Signore degli Anelli, Il - La Terza Era"
region: "PAL-I"
gsHWFixes:
halfPixelOffset: 1 # Fixes ghosting in cutscenes.
SLES-52805:
name: "Lord of the Rings, The - The Third Age"
name: "Señor de Los Anillos, El - La Tercera Edad"
region: "PAL-S"
gsHWFixes:
halfPixelOffset: 1 # Fixes ghosting in cutscenes.
@ -15395,7 +15400,7 @@ SLES-52807:
gsHWFixes:
halfPixelOffset: 1 # Reduces lighting misalignment but doesn't fully fix it.
SLES-52808:
name: "Lemony Snicket's A Series of Unfortunate Events"
name: "Désastreuses Aventures des orphelins Baudelaire, Les"
region: "PAL-F"
clampModes:
eeClampMode: 3 # Fixes the inability to collect items.
@ -15409,7 +15414,7 @@ SLES-52809:
gsHWFixes:
halfPixelOffset: 1 # Reduces lighting misalignment but doesn't fully fix it.
SLES-52810:
name: "Lemony Snicket's Una Serie Disfortunati Eventi"
name: "Lemony Snicket Una Serie Di Sfortunati Eventi"
region: "PAL-I"
clampModes:
eeClampMode: 3 # Fixes the inability to collect items.
@ -15433,7 +15438,7 @@ SLES-52815:
name: "Disney-Pixar's The Incredibles"
region: "PAL-G"
SLES-52816:
name: "Incredibles, The"
name: "Increíbles, Los"
region: "PAL-S"
SLES-52820:
name: "Incredibles, The"
@ -15451,7 +15456,7 @@ SLES-52824:
name: "Furry Tales"
region: "PAL-E-F"
SLES-52825:
name: "Lemony Snicket's A Series of Unfortunate Events"
name: "Serie de Catastróficas Desdichas de Lemony Snicket, Una"
region: "PAL-S"
clampModes:
eeClampMode: 3 # Fixes the inability to collect items.
@ -15821,7 +15826,7 @@ SLES-52985:
name: "Spongebob SquarePants - The Movie"
region: "PAL-G"
SLES-52986:
name: "Spongebob SquarePants - The Movie"
name: "Bob Esponja La Película"
region: "PAL-S"
SLES-52988:
name: "Mega Man X8"
@ -16262,7 +16267,7 @@ SLES-53143:
name: "Fantastic Four"
region: "PAL-E"
SLES-53144:
name: "Four Fantastiques, Les"
name: "4 Fantastiques, Les"
region: "PAL-F"
SLES-53145:
name: "Fantastic Four"
@ -16271,7 +16276,7 @@ SLES-53146:
name: "I Fantastici Quattro"
region: "PAL-I"
SLES-53147:
name: "Four Fantasticos, Los"
name: "4 Fantásticos, Los"
region: "PAL-S"
SLES-53148:
name: "Fruitfall"
@ -16466,7 +16471,7 @@ SLES-53242:
roundSprite: 2 # Improves bloom alignment and clarity.
halfPixelOffset: 2 # Improves bloom alignment and clarity.
SLES-53246:
name: "Dreamworks Madagascar"
name: "Madagascar"
region: "PAL-S"
gsHWFixes:
roundSprite: 2 # Improves bloom alignment and clarity.
@ -17346,7 +17351,7 @@ SLES-53580:
name: "NBA Live '06"
region: "PAL-F"
SLES-53581:
name: "NBA Live '06"
name: "NBA Live 06"
region: "PAL-S"
SLES-53582:
name: "Bratz - Rock Angelz"
@ -17652,12 +17657,12 @@ SLES-53706:
gsHWFixes:
halfPixelOffset: 2 # Fixes lighting misalignment.
SLES-53707:
name: "Chronicles of Narnia, The - The Lion, The Witch and The Wardrobe"
name: "Chroniken von Narnia, Die - Der König von Narnia"
region: "PAL-G"
gsHWFixes:
halfPixelOffset: 2 # Fixes lighting misalignment.
SLES-53708:
name: "Chronicles of Narnia, The - The Lion, The Witch and The Wardrobe"
name: "Cronache di Narnia, Le - Il Leone, La Strega e L'Armadio"
region: "PAL-I"
gsHWFixes:
halfPixelOffset: 2 # Fixes lighting misalignment.
@ -17667,7 +17672,7 @@ SLES-53709:
gsHWFixes:
halfPixelOffset: 2 # Fixes lighting misalignment.
SLES-53710:
name: "Chronicles of Narnia, The - The Lion, The Witch and The Wardrobe"
name: "Crónicas de Narnia, Las - El León, La Bruja y El Armario"
region: "PAL-S"
gsHWFixes:
halfPixelOffset: 2 # Fixes lighting misalignment.
@ -18137,9 +18142,6 @@ SLES-53886:
patch=1,EE,0037EBD8,word,4af103bc
patch=1,EE,0037EBF0,word,4a800460
patch=1,EE,0037EBF4,word,4b7103bc
SLES-53897:
name: "Dreamworks Vecinos Invasores"
region: "PAL-S"
SLES-53899:
name: "Pro Evolution Soccer Management"
region: "PAL-M5"
@ -18200,7 +18202,7 @@ SLES-53913:
name: "Plan, The"
region: "PAL-F-I"
SLES-53914:
name: "Plan, The"
name: "Plan, Th3"
region: "PAL-S"
SLES-53915:
name: "Space War Attack"
@ -18343,12 +18345,12 @@ SLES-53984:
patch=1,EE,002FF3F0,word,27BDFEE0
patch=1,EE,002FF42C,word,27BD0120
SLES-53986:
name: "Over the Hedge"
name: "gang del bosco, La"
region: "PAL-I"
speedHacks:
MTVUSpeedHack: 0 # Fixes bad graphics due to bad T-Bit handling.
SLES-53987:
name: "Over the Hedge"
name: "Vecinos Invasores"
region: "PAL-S"
speedHacks:
MTVUSpeedHack: 0 # Fixes bad graphics due to bad T-Bit handling.
@ -18993,7 +18995,7 @@ SLES-54250:
name: "NBA Live '07"
region: "PAL-F"
SLES-54251:
name: "NBA Live '07"
name: "NBA Live 07"
region: "PAL-S"
SLES-54252:
name: "NBA Live '07"
@ -19427,7 +19429,7 @@ SLES-54451:
name: "Himmel und Huhn - Ace in Action"
region: "PAL-G"
SLES-54452:
name: "Chicken Little - 'As' en Accion"
name: "Disney Chicken Little - As en Acción"
region: "PAL-S"
SLES-54453:
name: "Chicken Little - Asso Spaziale!"
@ -19443,7 +19445,6 @@ SLES-54455:
gsHWFixes:
halfPixelOffset: 1 # Fixes misaligned bloom effects.
mergeSprite: 1 # Fixes blurriness but removes bloom + Recommended to use Shadeboost brightness 80.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54456:
name: "Beverly Hills Cop"
@ -19609,7 +19610,6 @@ SLES-54516:
gsHWFixes:
halfPixelOffset: 1 # Fixes misaligned bloom effects.
mergeSprite: 1 # Fixes blurriness but removes bloom + Recommended to use Shadeboost brightness 80.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54517:
name: "Thrillville"
@ -19617,7 +19617,6 @@ SLES-54517:
gsHWFixes:
halfPixelOffset: 1 # Fixes misaligned bloom effects.
mergeSprite: 1 # Fixes blurriness but removes bloom + Recommended to use Shadeboost brightness 80.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54518:
name: "Clumsy Shumsy"
@ -19799,7 +19798,7 @@ SLES-54596:
name: "Heatseeker"
region: "PAL-M3"
SLES-54604:
name: "¡Qué Pasa Neng! El Videojuego"
name: "¡Qué pasa Neng! El videojuego"
region: "PAL-S"
SLES-54606:
name: "Harley-Davidson - Race to the Rally"
@ -20345,14 +20344,12 @@ SLES-54806:
region: "PAL-E"
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54807:
name: "Thrillville - Off the Rails"
region: "PAL-F"
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54809:
name: "Charlotte's Web"
@ -20565,7 +20562,6 @@ SLES-54887:
region: "PAL-G"
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-54888:
name: "Pro Biker 2"
@ -20921,14 +20917,12 @@ SLES-55010:
region: "PAL-I"
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-55011:
name: "Thrillville - Fuera de Control"
region: "PAL-S"
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLES-55012:
name: "Golden Compass, The"
@ -23882,6 +23876,7 @@ SLPM-55080:
eeClampMode: 3 # Characters are visible in-game.
gsHWFixes:
texturePreloading: 1 # Performs better with partial preload because it is slow on locations outside gameplay foremost.
mergeSprite: 1 # Fixes misaligned white lines.
SLPM-55081:
name: "Drag-on Dragoon 2 - Fuuin no Aka, Haitoku no Kuro [Ultimate Hits]"
region: "NTSC-J"
@ -25450,6 +25445,9 @@ SLPM-62343:
SLPM-62344:
name: "Simple 2000 Series Vol. 31 - The Chikyuu Boueigun"
region: "NTSC-J"
gsHWFixes:
mipmap: 2 # Improves distant textures.
trilinearFiltering: 1 # Smooths high frequency textures on distant ground.
SLPM-62345:
name: "Simple 2000 Series Vol. 32 - The Sensha"
region: "NTSC-J"
@ -27727,6 +27725,7 @@ SLPM-65266:
eeClampMode: 3 # Characters are visible in-game.
gsHWFixes:
texturePreloading: 1 # Performs better with partial preload because it is slow on locations outside gameplay foremost.
mergeSprite: 1 # Fixes misaligned white lines.
SLPM-65267:
name: "Kurogane no Houkou 2 - Warship Gunner"
region: "NTSC-J"
@ -27888,6 +27887,8 @@ SLPM-65310:
SLPM-65311:
name: "Violet no Atelier - Gramnad no Renkinjutsushi"
region: "NTSC-J"
gsHWFixes:
roundSprite: 1 # Aligns text boxes.
SLPM-65313:
name: "First Kiss Story 1&2"
region: "NTSC-J"
@ -29056,6 +29057,8 @@ SLPM-65682:
SLPM-65683:
name: "Violet no Atelier - Gramnad no Renkinjutsushi [Gust Best Price]"
region: "NTSC-J"
gsHWFixes:
roundSprite: 1 # Aligns text boxes.
SLPM-65684:
name: "Meine Liebe - Yuubinaru Kioku"
region: "NTSC-J"
@ -30772,7 +30775,6 @@ SLPM-66167:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SLPM-66168:
name: "Ryu Ga Gotoku"
@ -33839,7 +33841,6 @@ SLPM-67010:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SLPM-67011:
name: "God of War [CapKore]"
@ -33847,7 +33848,6 @@ SLPM-67011:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SLPM-67012:
name: "God of War [Best Price]"
@ -33855,7 +33855,6 @@ SLPM-67012:
gsHWFixes:
alignSprite: 1 # Fixes water vertical lines.
roundSprite: 1 # Fixes vertical lines and minor ghosting.
wrapGSMem: 1 # Fixes FMV when in progressive mode.
autoFlush: 1 # Fixes sun going through walls.
SLPM-67013:
name: "God of War II - The End Begins"
@ -39810,6 +39809,8 @@ SLUS-20024:
name: "Legacy of Kain - Blood Omen 2"
region: "NTSC-U"
compat: 5
roundModes:
eeRoundMode: 0 # Fixes pathing.
gsHWFixes:
mipmap: 1 # Fixes glitching textures.
SLUS-20028:
@ -42669,6 +42670,8 @@ SLUS-20682:
name: "K-1 World Grand Prix"
region: "NTSC-U"
compat: 5
gsHWFixes:
alignSprite: 1 # Fixes black vertical lines.
SLUS-20683:
name: "Lupin the 3rd - Treasure of the Sorcerer King"
region: "NTSC-U"
@ -42906,6 +42909,7 @@ SLUS-20732:
eeClampMode: 3 # Characters are visible in-game.
gsHWFixes:
texturePreloading: 1 # Performs better with partial preload because it is slow on locations outside gameplay foremost.
mergeSprite: 1 # Fixes misaligned white lines.
SLUS-20733:
name: "Castlevania - Lament of Innocence"
region: "NTSC-U"
@ -46480,7 +46484,6 @@ SLUS-21413:
gsHWFixes:
halfPixelOffset: 1 # Fixes misaligned bloom effects.
mergeSprite: 1 # Fixes blurriness but removes bloom + Recommended to use Shadeboost brightness 80.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLUS-21414:
name: "Delta Force - Black Hawk Down - Team Sabre"
@ -47346,7 +47349,6 @@ SLUS-21611:
compat: 5
gsHWFixes:
halfPixelOffset: 2 # Fixes misaligned bloom effects, 1 is technically more correct compared to software but looks worse.
wrapGSMem: 1 # Fixes FMVs missing video pieces.
deinterlace: 8 # Game requires adaptive (or blend) tff deinterlacing instead of auto for the whole game.
SLUS-21612:
name: "Legend of the Dragon"

19
bin/resources/game_controller_db.txt
Unescape View File

@ -203,6 +203,7 @@
03000000ac0500005b05000000000000,GameSir G3w,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Windows,
03000000ac0500002d02000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
03000000ac0500004d04000000000000,GameSir G4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
03000000ac0500001a06000000000000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
030000004c0e00001035000000000000,Gamester,a:b0,b:b1,back:b7,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b10,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b11,rightx:a3,righty:a4,start:b6,x:b2,y:b3,platform:Windows,
030000000d0f00001110000000000000,GameStick Controller,a:b0,b:b1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
0300000047530000616d000000000000,GameStop,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Windows,
@ -560,6 +561,7 @@
03000000830500006020000000000000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Windows,
03000000bd12000013d0000000000000,Retrolink Sega Saturn Classic Controller,a:b0,b:b1,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b5,lefttrigger:b6,rightshoulder:b2,righttrigger:b7,start:b8,x:b3,y:b4,platform:Windows,
03000000bd12000015d0000000000000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Windows,
03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Windows,
0300000000f000000300000000000000,RetroUSB RetroPad,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
0300000000f00000f100000000000000,RetroUSB Super RetroPort,a:b1,b:b5,back:b2,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Windows,
03000000830500000960000000000000,Revenger,a:b0,b:b1,leftshoulder:b6,lefttrigger:b7,leftx:a0,lefty:a1,rightshoulder:b2,righttrigger:b3,x:b4,y:b5,platform:Windows,
@ -749,7 +751,6 @@
03000000172700004431000000000000,Xiaomi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b20,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a7,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Windows,
03000000172700003350000000000000,Xiaomi XMGP01YM,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
03000000bc2000005060000000000000,Xiaomi XMGP01YM,+lefty:+a2,+righty:+a5,-lefty:-a1,-righty:-a4,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,start:b11,x:b3,y:b4,platform:Windows,
03000000786901006e70000000000000,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Windows,
030000007d0400000340000000000000,Xterminator Digital Gamepad,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:-a4,lefttrigger:+a4,leftx:a0,lefty:a1,paddle1:b7,paddle2:b6,rightshoulder:b5,rightstick:b9,righttrigger:b2,rightx:a3,righty:a5,start:b8,x:b3,y:b4,platform:Windows,
03000000790000004f18000000000000,ZDT Android Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b3,y:b4,platform:Windows,
@ -799,6 +800,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Mac OS X,
03000000c82d00001130000000020000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000c82d00001330000001000000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000c82d00001330000000020000,8BitDo Ultimate Wireless Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000a00500003232000008010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000a00500003232000009010000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000c82d00001890000001000000,8BitDo Zero 2,a:b1,b:b0,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Mac OS X,
@ -825,10 +827,12 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000151900004000000001000000,Flydigi Vader 2,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
03000000b40400001124000000000000,Flydigi Vader 2,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b12,lefttrigger:b8,leftx:a0,lefty:a1,paddle1:b4,paddle2:b5,paddle3:b17,rightshoulder:b7,rightstick:b13,righttrigger:b9,rightx:a3,righty:a4,start:b11,x:b2,y:b3,platform:Mac OS X,
03000000790000004618000000010000,GameCube Controller Adapter,a:b4,b:b0,dpdown:b56,dpleft:b60,dpright:b52,dpup:b48,lefttrigger:a12,leftx:a0,lefty:a4,rightshoulder:b28,righttrigger:a16,rightx:a20,righty:a8,start:b36,x:b8,y:b12,platform:Mac OS X,
03000000ac0500001a06000002020000,GameSir-T3 2.02,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000ad1b000001f9000000000000,Gamestop BB070 X360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
0500000047532047616d657061640000,GameStop Gamepad,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b2,y:b3,platform:Mac OS X,
03000000c01100000140000000010000,GameStop PS4 Fun Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
030000006f0e00000102000000000000,GameStop Xbox 360 Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
03000000ff1100003133000007010000,GameWare PC Control Pad,a:b2,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,leftstick:b8,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:b7,rightx:a3,righty:a4,start:b11,x:b3,y:b0,platform:Mac OS X,
030000007d0400000540000001010000,Gravis Eliminator Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
03000000280400000140000000020000,Gravis GamePad Pro,a:b1,b:b2,back:b8,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
030000008f0e00000300000007010000,GreenAsia Joystick,a:b2,b:b3,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b6,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b0,y:b1,platform:Mac OS X,
@ -844,6 +848,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
030000000d0f00004d00000000000000,Hori Gem Pad 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
030000000d0f00003801000008010000,Hori PC Engine Mini Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,start:b9,platform:Mac OS X,
030000000d0f00009200000000010000,Hori Pokken Tournament DX Pro,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
030000000d0f0000aa00000072050000,Hori Real Arcade Pro,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b3,y:b0,platform:Mac OS X,
030000000d0f00006e00000000010000,Horipad 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Mac OS X,
030000000d0f00006600000000010000,Horipad 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
030000000d0f00006600000000000000,Horipad FPS Plus 4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
@ -895,6 +900,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
030000007e0500001920000001000000,NSO N64 Controller,+rightx:b8,+righty:b7,-rightx:b3,-righty:b2,a:b1,b:b0,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,misc1:b13,rightshoulder:b5,righttrigger:b10,start:b9,platform:Mac OS X,
030000007e0500001720000001000000,NSO SNES Controller,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b15,start:b9,x:b2,y:b3,platform:Mac OS X,
03000000550900001472000025050000,NVIDIA Controller,a:b0,b:b1,back:b17,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b4,leftstick:b7,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b8,righttrigger:a4,rightx:a2,righty:a5,start:b6,x:b2,y:b3,platform:Mac OS X,
030000004b120000014d000000010000,Nyko Airflo EX,a:b0,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b11,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b12,righttrigger:b7,rightx:a3,righty:a2,start:b9,x:b2,y:b3,platform:Mac OS X,
030000006f0e00000901000002010000,PDP Versus Fighting,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,start:b9,x:b0,y:b3,platform:Mac OS X,
030000008f0e00000300000000000000,Piranha Xtreme PS3 Controller,a:b2,b:b1,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b10,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b11,righttrigger:b5,rightx:a3,righty:a2,start:b9,x:b3,y:b0,platform:Mac OS X,
03000000666600006706000088020000,PlayStation Adapter,a:b2,b:b1,back:b8,dpdown:b14,dpleft:b15,dpright:b13,dpup:b12,leftshoulder:b6,lefttrigger:b4,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b5,rightx:a2,righty:a3,start:b11,x:b3,y:b0,platform:Mac OS X,
@ -931,6 +937,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000790000001100000005010000,Retro Controller,a:b1,b:b2,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b6,lefttrigger:b7,rightshoulder:b5,righttrigger:b4,start:b9,x:b0,y:b3,platform:Mac OS X,
03000000830500006020000000010000,Retro Controller,a:b0,b:b1,back:b6,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b4,lefttrigger:b5,rightshoulder:b8,righttrigger:b9,start:b7,x:b2,y:b3,platform:Mac OS X,
03000000790000001100000006010000,Retrolink SNES Controller,a:b2,b:b1,back:b8,dpdown:+a4,dpleft:-a3,dpright:+a3,dpup:-a4,leftshoulder:b4,rightshoulder:b5,start:b9,x:b3,y:b0,platform:Mac OS X,
03000000341200000400000000000000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Mac OS X,
030000006b140000010d000000010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
030000006b140000130d000000010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
03000000c6240000fefa000000000000,Rock Candy PS3,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
@ -977,6 +984,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
030000005e040000050b000003090000,Xbox Elite Controller Series 2,a:b0,b:b1,back:b31,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b53,leftshoulder:b6,leftstick:b13,lefttrigger:a6,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000130b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000200b000011050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000200b000013050000,Xbox One Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000d102000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
030000005e040000dd02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
030000005e040000e002000000000000,Xbox One Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b4,leftstick:b8,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b9,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Mac OS X,
@ -984,7 +992,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
030000005e040000e302000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
030000005e040000ea02000000000000,Xbox One Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
030000005e040000fd02000003090000,Xbox One Controller,a:b0,b:b1,back:b16,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000200b000013050000,Xbox One Controller,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Mac OS X,
03000000c62400003a54000000000000,Xbox One PowerA Controller,a:b0,b:b1,back:b9,dpdown:b12,dpleft:b13,dpright:b14,dpup:b11,guide:b10,leftshoulder:b4,leftstick:b6,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b7,righttrigger:a5,rightx:a3,righty:a4,start:b8,x:b2,y:b3,platform:Mac OS X,
030000005e040000130b000001050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
030000005e040000130b000005050000,Xbox Series Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Mac OS X,
@ -994,7 +1001,6 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000172700004431000029010000,XiaoMi Controller,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b15,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a6,rightx:a2,righty:a5,start:b11,x:b3,y:b4,platform:Mac OS X,
03000000120c0000100e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
03000000120c0000101e000000010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Mac OS X,
03000000ff1100003133000007010000,GameWare PC Control Pad,a:b2,b:b1,x:b3,y:b0,back:b10,start:b11,leftstick:b8,rightstick:b9,leftshoulder:b4,rightshoulder:b5,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:b6,righttrigger:b7,platform:Mac OS X,
# Linux
030000005e0400008e02000020010000,8BitDo Adapter,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@ -1023,6 +1029,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000c82d00000751000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
05000000c82d00000851000000010000,8BitDo P30,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,lefttrigger:a8,leftx:a0,lefty:a1,rightshoulder:b7,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
03000000c82d00000660000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001030000011010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
05000000c82d00000660000000010000,8BitDo Pro 2,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00000131000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00000231000011010000,8BitDo Receiver,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b2,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
@ -1045,10 +1052,9 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
05000000c82d00006228000000010000,8BitDo SN30 Pro,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00000260000011010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
05000000c82d00000261000000010000,8BitDo SN30 Pro Plus,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:b8,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:b9,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001030000011010000,8BitDo 8BitDo Pro 2,a:b1,b:b0,x:b4,y:b3,back:b10,guide:b12,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,
05000000202800000900000000010000,8BitDo SNES30,a:b1,b:b0,back:b10,dpdown:b122,dpleft:b119,dpright:b120,dpup:b117,leftshoulder:b6,rightshoulder:b7,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001130000011010000,8BitDo Ultimate Wired,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
03000000c82d00000760000011010000,8BitDo Ultimate Wireless,a:b1,b:b0,x:b4,y:b3,back:b10,start:b11,leftstick:b13,rightstick:b14,leftshoulder:b6,rightshoulder:b7,dpup:h0.1,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,
03000000c82d00000760000011010000,8BitDo Ultimate Wireless,a:b1,b:b0,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b4,y:b3,platform:Linux,
03000000c82d00001230000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
03000000c82d00001330000011010000,8BitDo Ultimate Wireless,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a5,leftx:a0,lefty:a1,misc1:b26,paddle1:b23,paddle2:b19,rightshoulder:b7,rightstick:b14,righttrigger:a4,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
05000000a00500003232000001000000,8BitDo Zero,a:b0,b:b1,back:b10,dpdown:+a1,dpleft:-a0,dpright:+a0,dpup:-a1,leftshoulder:b6,rightshoulder:b7,start:b11,x:b3,y:b4,platform:Linux,
@ -1137,6 +1143,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
03000000632500002605000010010000,HJDX,a:b0,b:b1,back:b10,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b6,leftstick:b13,lefttrigger:a4,leftx:a0,lefty:a1,rightshoulder:b7,rightstick:b14,righttrigger:a5,rightx:a2,righty:a3,start:b11,x:b3,y:b4,platform:Linux,
030000000d0f00000d00000000010000,Hori,a:b0,b:b6,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b10,leftshoulder:b3,rightshoulder:b7,start:b9,x:b1,y:b2,platform:Linux,
030000000d0f00006d00000020010000,Hori EDGE 301,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:+a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:+a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
030000000d0f00008400000011010000,Hori Fighting Commander,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
030000000d0f00005f00000011010000,Hori Fighting Commander 4 PS3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:b6,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:b7,rightx:a2,righty:a3,start:b9,x:b0,y:b3,platform:Linux,
030000000d0f00005e00000011010000,Hori Fighting Commander 4 PS4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
030000000d0f00005001000009040000,Hori Fighting Commander OCTA Xbox One,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@ -1388,6 +1395,7 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
0300000081170000990a000001010000,Retronic Adapter,a:b0,leftx:a0,lefty:a1,platform:Linux,
0300000000f000000300000000010000,RetroPad,a:b1,b:b5,back:b2,leftshoulder:b6,leftx:a0,lefty:a1,rightshoulder:b7,start:b3,x:b0,y:b4,platform:Linux,
00000000526574726f53746f6e653200,RetroStone 2 Controller,a:b1,b:b0,back:b10,dpdown:b15,dpleft:b16,dpright:b17,dpup:b14,leftshoulder:b6,lefttrigger:b8,rightshoulder:b7,righttrigger:b9,start:b11,x:b4,y:b3,platform:Linux,
03000000341200000400000000010000,RetroUSB N64 RetroPort,+rightx:b8,+righty:b10,-rightx:b9,-righty:b11,a:b7,b:b6,dpdown:b2,dpleft:b1,dpright:b0,dpup:b3,leftshoulder:b13,lefttrigger:b5,leftx:a0,lefty:a1,rightshoulder:b12,start:b4,platform:Linux,
030000006b140000010d000011010000,Revolution Pro Controller,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
030000006b140000130d000011010000,Revolution Pro Controller 3,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
030000006f0e00001f01000000010000,Rock Candy,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
@ -1527,4 +1535,5 @@ xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,
xinput,XInput Controller,a:b0,b:b1,back:b6,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,platform:Linux,
03000000120c0000100e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
03000000120c0000101e000011010000,Zeroplus P4,a:b1,b:b2,back:b8,dpdown:h0.4,dpleft:h0.8,dpright:h0.2,dpup:h0.1,guide:b12,leftshoulder:b4,leftstick:b10,lefttrigger:a3,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b11,righttrigger:a4,rightx:a2,righty:a5,start:b9,x:b0,y:b3,platform:Linux,
03000000f00300008d03000011010000,HyperX Clutch,a:b0,b:b1,x:b3,y:b4,back:b10,guide:b12,start:b11,leftshoulder:b6,rightshoulder:b7,leftstick:b13,rightstick:b14,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a5,righttrigger:a4,platform:Linux,

2
bin/resources/shaders/common/ffx_cas.h
Unescape View File

@ -393,7 +393,7 @@ A_STATIC void CasSetup(
const1[0]=AU1_AF1(sharp);
const1[1]=AU1_AH2_AF2(hSharp);
const1[2]=AU1_AF1(AF1_(8.0)*inputSizeInPixelsX*ARcpF1(outputSizeInPixelsX));
const1[3]=0;}
const1[3]=AU1(0);}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
//_____________________________________________________________/\_______________________________________________________________

24
bin/resources/shaders/common/fxaa.fx
Unescape View File

@ -1,5 +1,14 @@
#if defined(SHADER_MODEL) || defined(FXAA_GLSL_130) || defined(FXAA_GLSL_VK) || defined(__METAL_VERSION__)
#ifndef SHADER_MODEL
#define SHADER_MODEL 0
#endif
#ifndef FXAA_HLSL_4
#define FXAA_HLSL_4 0
#endif
#ifndef FXAA_HLSL_5
#define FXAA_HLSL_5 0
#endif
#ifndef FXAA_GLSL_130
#define FXAA_GLSL_130 0
#endif
@ -55,19 +64,22 @@ static constexpr sampler MAIN_SAMPLER(coord::normalized, address::clamp_to_edge,
[FXAA CODE SECTION]
------------------------------------------------------------------------------*/
// We don't use gather4 for alpha/luminance because it would require an additional
// pass to compute the values, which would be slower than the extra shader loads.
#if (SHADER_MODEL >= 0x500)
#define FXAA_HLSL_5 1
#define FXAA_GATHER4_ALPHA 1
#define FXAA_GATHER4_ALPHA 0
#elif (SHADER_MODEL >= 0x400)
#define FXAA_HLSL_4 1
#define FXAA_GATHER4_ALPHA 0
#elif (FXAA_GLSL_130 == 1 || FXAA_GLSL_VK == 1)
#define FXAA_GATHER4_ALPHA 1
#define FXAA_GATHER4_ALPHA 0
#elif defined(__METAL_VERSION__)
#define FXAA_GATHER4_ALPHA 1
#define FXAA_GATHER4_ALPHA 0
#endif
#if (FXAA_HLSL_5 == 1)
@ -505,7 +517,7 @@ float4 FxaaPass(float4 FxaaColor, float2 uv0, texture2d<float> tex)
FxaaColor = FxaaPixelShader(uv0, tex, 1.0/PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin);
#elif (FXAA_GLSL_130 == 1 || FXAA_GLSL_VK == 1)
vec2 PixelSize = textureSize(TextureSampler, 0);
vec2 PixelSize = vec2(textureSize(TextureSampler, 0));
FxaaColor = FxaaPixelShader(uv0, TextureSampler, 1.0/PixelSize.xy, FxaaSubpixMax, FxaaEdgeThreshold, FxaaEdgeThresholdMin);
#elif defined(__METAL_VERSION__)
float2 PixelSize = float2(tex.get_width(), tex.get_height());
@ -526,7 +538,7 @@ void main()
color = PreGammaPass(color);
color = FxaaPass(color, PSin_t);
SV_Target0 = color;
SV_Target0 = float4(color.rgb, 1.0);
}
#elif (SHADER_MODEL >= 0x400)
@ -539,7 +551,7 @@ PS_OUTPUT ps_main(VS_OUTPUT input)
color = PreGammaPass(color);
color = FxaaPass(color, input.t);
output.c = color;
output.c = float4(color.rgb, 1.0);
return output;
}

4
bin/resources/shaders/opengl/common_header.glsl
Unescape View File

@ -6,6 +6,7 @@
#ifdef VERTEX_SHADER
#if !pGL_ES
out gl_PerVertex {
vec4 gl_Position;
float gl_PointSize;
@ -13,6 +14,7 @@ out gl_PerVertex {
float gl_ClipDistance[1];
#endif
};
#endif
#endif
@ -20,6 +22,7 @@ out gl_PerVertex {
#ifdef GEOMETRY_SHADER
#if !pGL_ES
in gl_PerVertex {
vec4 gl_Position;
float gl_PointSize;
@ -35,6 +38,7 @@ out gl_PerVertex {
float gl_ClipDistance[1];
#endif
};
#endif
#endif

28
bin/resources/shaders/opengl/convert.glsl
Unescape View File

@ -75,7 +75,11 @@ void ps_convert_rgba8_16bits()
void ps_convert_float32_32bits()
{
// Convert a GL_FLOAT32 depth texture into a 32 bits UINT texture
#if HAS_CLIP_CONTROL
SV_Target1 = uint(exp2(32.0f) * sample_c().r);
#else
SV_Target1 = uint(exp2(24.0f) * sample_c().r);
#endif
}
#endif
@ -83,7 +87,11 @@ void ps_convert_float32_32bits()
void ps_convert_float32_rgba8()
{
// Convert a GL_FLOAT32 depth texture into a RGBA color texture
#if HAS_CLIP_CONTROL
uint d = uint(sample_c().r * exp2(32.0f));
#else
uint d = uint(sample_c().r * exp2(24.0f));
#endif
SV_Target0 = vec4(uvec4((d & 0xFFu), ((d >> 8) & 0xFFu), ((d >> 16) & 0xFFu), (d >> 24))) / vec4(255.0);
}
#endif
@ -92,7 +100,11 @@ void ps_convert_float32_rgba8()
void ps_convert_float16_rgb5a1()
{
// Convert a GL_FLOAT32 (only 16 lsb) depth into a RGB5A1 color texture
#if HAS_CLIP_CONTROL
uint d = uint(sample_c().r * exp2(32.0f));
#else
uint d = uint(sample_c().r * exp2(24.0f));
#endif
SV_Target0 = vec4(uvec4((d & 0x1Fu), ((d >> 5) & 0x1Fu), ((d >> 10) & 0x1Fu), (d >> 15) & 0x01u)) / vec4(32.0f, 32.0f, 32.0f, 1.0f);
}
#endif
@ -100,25 +112,41 @@ void ps_convert_float16_rgb5a1()
float rgba8_to_depth32(vec4 unorm)
{
uvec4 c = uvec4(unorm * vec4(255.5f));
#if HAS_CLIP_CONTROL
return float(c.r | (c.g << 8) | (c.b << 16) | (c.a << 24)) * exp2(-32.0f);
#else
return float(c.r | (c.g << 8) | (c.b << 16) | (c.a << 24)) * exp2(-24.0f);
#endif
}
float rgba8_to_depth24(vec4 unorm)
{
uvec3 c = uvec3(unorm.rgb * vec3(255.5f));
#if HAS_CLIP_CONTROL
return float(c.r | (c.g << 8) | (c.b << 16)) * exp2(-32.0f);
#else
return float(c.r | (c.g << 8) | (c.b << 16)) * exp2(-24.0f);
#endif
}
float rgba8_to_depth16(vec4 unorm)
{
uvec2 c = uvec2(unorm.rg * vec2(255.5f));
#if HAS_CLIP_CONTROL
return float(c.r | (c.g << 8)) * exp2(-32.0f);
#else
return float(c.r | (c.g << 8)) * exp2(-24.0f);
#endif
}
float rgb5a1_to_depth16(vec4 unorm)
{
uvec4 c = uvec4(unorm * vec4(255.5f));
#if HAS_CLIP_CONTROL
return float(((c.r & 0xF8u) >> 3) | ((c.g & 0xF8u) << 2) | ((c.b & 0xF8u) << 7) | ((c.a & 0x80u) << 8)) * exp2(-32.0f);
#else
return float(((c.r & 0xF8u) >> 3) | ((c.g & 0xF8u) << 2) | ((c.b & 0xF8u) << 7) | ((c.a & 0x80u) << 8)) * exp2(-24.0f);
#endif
}
#ifdef ps_convert_rgba8_float32

44
bin/resources/shaders/opengl/interlace.glsl
Unescape View File

@ -14,9 +14,9 @@ layout(location = 0) out vec4 SV_Target0;
// Weave shader
void ps_main0()
{
const int idx = int(ZrH.x); // buffer index passed from CPU
const int field = idx & 1; // current field
const int vpos = int(gl_FragCoord.y); // vertical position of destination texture
int idx = int(ZrH.x); // buffer index passed from CPU
int field = idx & 1; // current field
int vpos = int(gl_FragCoord.y); // vertical position of destination texture
if ((vpos & 1) == field)
SV_Target0 = texture(TextureSampler, PSin_t);
@ -54,16 +54,16 @@ void ps_main3()
// causing the wrong lines to be discarded, so a vertical offset (lofs) is added to the vertical
// position of the destination texture to force the proper field alignment
const int idx = int(ZrH.x); // buffer index passed from CPU
const int bank = idx >> 1; // current bank
const int field = idx & 1; // current field
const int vres = int(ZrH.z) >> 1; // vertical resolution of source texture
const int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
const int vpos = int(gl_FragCoord.y) + lofs; // vertical position of destination texture
const vec2 bofs = vec2(0.0f, 0.5f * bank); // vertical offset of the current bank relative to source texture size
const vec2 vscale = vec2(1.0f, 2.0f); // scaling factor from source to destination texture
const vec2 optr = PSin_t - bofs; // used to check if the current destination line is within the current bank
const vec2 iptr = optr * vscale; // pointer to the current pixel in the source texture
int idx = int(ZrH.x); // buffer index passed from CPU
int bank = idx >> 1; // current bank
int field = idx & 1; // current field
int vres = int(ZrH.z) >> 1; // vertical resolution of source texture
int lofs = ((((vres + 1) >> 1) << 1) - vres) & bank; // line alignment offset for bank 1
int vpos = int(gl_FragCoord.y) + lofs; // vertical position of destination texture
vec2 bofs = vec2(0.0f, 0.5f * float(bank)); // vertical offset of the current bank relative to source texture size
vec2 vscale = vec2(1.0f, 2.0f); // scaling factor from source to destination texture
vec2 optr = PSin_t - bofs; // used to check if the current destination line is within the current bank
vec2 iptr = optr * vscale; // pointer to the current pixel in the source texture
// if the index of current destination line belongs to the current fiels we update it, otherwise
// we leave the old line in the destination buffer
@ -79,15 +79,15 @@ void ps_main4()
{
// we use the contents of the MAD frame buffer to reconstruct the missing lines from the current field.
const int idx = int(ZrH.x); // buffer index passed from CPU
const int field = idx & 1; // current field
const int vpos = int(gl_FragCoord.y); // vertical position of destination texture
const float sensitivity = ZrH.w; // passed from CPU, higher values mean more likely to use weave
const vec3 motion_thr = vec3(1.0, 1.0, 1.0) * sensitivity; //