LunaMoo
df8fb36bc6
Merge branch 'master' into TemporaryHackishBranch
2020-04-06 08:24:10 +02:00
Henrik Rydgård
268df5aa6c
Merge pull request #12799 from unknownbrackets/headless
...
Headless: Fix compile on Android
2020-04-06 00:44:16 +02:00
Unknown W. Brackets
84981631ea
Windows: Ensure we resize after hw transform swap.
2020-04-05 15:23:46 -07:00
Unknown W. Brackets
41dfe05de2
Headless: Fix compile on Android.
2020-04-05 15:23:13 -07:00
LunaMoo
8eafe8f84d
Revert some missed things.
2020-04-06 00:09:10 +02:00
LunaMoo
9c6f78c21f
Remove Realtime scaling (d3d11)
2020-04-05 23:58:38 +02:00
LunaMoo
4debff114c
Apparently my try to fix racing issue with mixed path was causing stability issue, oh well
v1.9.3-950-g4debff114
2020-04-05 23:04:10 +02:00
LunaMoo
23e647abfa
more ppge fixes
2020-04-05 23:04:10 +02:00
Henrik Rydgård
58fa094eaa
Merge pull request #12798 from unknownbrackets/ui-display
...
Cleanup display and touch control layout editors a bit more
2020-04-05 22:59:26 +02:00
Unknown W. Brackets
e291a1d833
UI: Small cleanup in touch control layout editor.
2020-04-05 12:50:13 -07:00
Unknown W. Brackets
0a353cc9fa
UI: General cleanup in layout editor.
2020-04-05 12:31:46 -07:00
Unknown W. Brackets
801617bfc6
UI: Prevent drag drift in layout editor.
...
Fixes #12797 .
2020-04-05 12:02:36 -07:00
Unknown W. Brackets
44e2849105
UI: Make display layout editor support 1x PSP.
...
When your window is at 1x PSP, we adjust DPI which the layout editor was
confused by.
2020-04-05 11:46:04 -07:00
LunaMoo
6e202e5bdd
Merge branch 'master' into TemporaryHackishBranch
...
# Conflicts:
# .gitignore
# CMakeLists.txt
# Core/HLE/sceNet.cpp
# UI/GameSettingsScreen.cpp
# UI/MainScreen.cpp
# UI/MiscScreens.cpp
# UI/ui_atlas.cpp
# UI/ui_atlas.h
# Windows/resource.h
# android/.gitignore
# android/assets/ui_atlas.zim
# assets/ui_atlas.zim
# assets/ui_atlas_lowmem.zim
# atlasscript_lowmem.txt
# ext/native/tools/atlastool/atlastool.vcxproj
# ext/native/tools/tools.sln
# ext/native/ui/ui_context.cpp
# gradle/wrapper/gradle-wrapper.properties
also fix atlas generation.
2020-04-05 19:34:24 +02:00
Henrik Rydgård
22298038b7
Merge pull request #12713 from webgeek1234/master
...
Travis: build libretro android
2020-04-05 18:37:44 +02:00
Unknown W. Brackets
a3bff95d35
Merge pull request #12796 from LunaMoo/fixSDKrequirements
...
Fix SDK requirements of Atlas and Zim tools.
2020-04-05 12:12:35 -04:00
LunaMoo
a0fef4136a
Fix SDK requirements of Atlas and Zim tools.
2020-04-05 16:56:08 +02:00
Henrik Rydgård
a0cdf566c7
Merge pull request #12794 from unknownbrackets/net-minor2
...
Net: Correct pool allocation
2020-04-05 16:49:50 +02:00
Unknown W. Brackets
91e1e75692
Net: Correct pool allocation.
2020-04-05 07:01:45 -07:00
Henrik Rydgård
350589dd65
Merge pull request #12790 from unknownbrackets/gpu-minor
...
Use consistent state for render mode and hw transform
2020-04-04 22:19:10 +02:00
Unknown W. Brackets
ac60e2ecd4
GPU: Track HW tess at start of frame too.
...
This also makes it so we don't force the setting off when you change
backends, and just ignore it if unsupported.
2020-04-04 11:52:32 -07:00
Unknown W. Brackets
46b9454e73
GPU: Reset hw transform once per frame.
...
Might prevent potential crashes if it changes mid-frame.
2020-04-04 11:21:22 -07:00
Unknown W. Brackets
30ede8240c
GPU: Move hw transform decision to draw engine.
2020-04-04 11:14:32 -07:00
Unknown W. Brackets
c42fb72419
GPU: Update uniforms w/ consistent render mode too.
2020-04-04 11:03:07 -07:00
Unknown W. Brackets
ad98609819
GPU: Use consistent buffered rendering state.
...
The setting can be changed in Qt and Windows between frames, so let's
track the current setting in most places. This is everywhere fbman is
easily accessible.
2020-04-04 10:51:47 -07:00
Henrik Rydgård
a26f8acf09
Merge pull request #12789 from tbocek/master
...
Not setting correct width and height causes flickering with frameskip with libretro
2020-04-04 18:12:06 +02:00
tbocek
1f49141c30
Setting the width and height to 0 made the frameskip unusable on lakka/libretro with a XU4 with a MALI GPU T628. The result was that bad flickering happened when in frameskip mode. Once it reached 60fps, no flickering, below that flickering. This change fixes the flickering and calls video_cb with the correct height and width.
2020-04-04 11:59:27 +02:00
Aaron Kling
1a2bc8cae9
Travis: build libretro android
2020-04-03 13:47:30 -05:00
Unknown W. Brackets
66471feeb2
Merge pull request #12787 from webgeek1234/libretro
...
libretro: Fix Android builds
2020-04-03 12:12:15 -04:00
Aaron Kling
a7f2415469
libretro: Fix Android builds
...
Text Drawer functionality is not available in libretro as it
depends on standalone jni calls. InputBox is also standalone only
gui functionality.
2020-04-03 09:59:16 -05:00
Henrik Rydgård
9cd8d216d8
Merge pull request #12785 from iota97/m2-cancel
...
Right mouse button as back in menu navigation
2020-04-02 23:20:42 +02:00
iota97
ee0ebfe071
Mouse 4 as back in menu navigation
2020-04-02 18:26:31 +02:00
Henrik Rydgård
90c1a79b9f
android: include path fix
2020-04-02 13:04:38 +02:00
Henrik Rydgård
80ae2846d6
Android: Change the display length for "toast" message to Toast.LENGTH_LONG
2020-04-02 01:04:17 +02:00
Henrik Rydgård
e8d6a605eb
Merge pull request #12748 from orbea/libpng
...
cmake: Improve building with the system libpng.
2020-04-01 12:57:52 +02:00
Henrik Rydgård
83df05a12a
Merge pull request #12784 from iota97/touch-layout-range
...
Touch layout remove redundant range check
2020-04-01 11:52:48 +02:00
iota97
a4a1b05842
Touch layout clean up
2020-04-01 11:34:54 +02:00
Henrik Rydgård
115048e139
Merge pull request #12783 from unknownbrackets/ui-controls
...
UI: Properly clamp control positioning in edit
2020-04-01 10:01:45 +02:00
Unknown W. Brackets
02e5049375
UI: Properly clamp control positioning in edit.
2020-03-31 21:43:18 -07:00
Unknown W. Brackets
a1ebc35c63
Merge pull request #12782 from Florin9doi/ios_notch
...
[iOS] Notch support
2020-03-31 23:28:58 -04:00
Florin9doi
92754e6c45
[iOS] Notch support
2020-04-01 00:05:11 +03:00
Henrik Rydgård
f01a4a3a87
Additional rendering fixes for notch
2020-03-31 16:46:14 +02:00
Henrik Rydgård
7dfe8959b3
Fix landscape/reverse landscape cutout padding issue, see #12779
2020-03-31 15:52:32 +02:00
Unknown W. Brackets
3965341af2
Merge pull request #12779 from hrydgard/notch-support
...
Support drawing around notches on Android displays. Fixes #12261
2020-03-30 21:10:48 -04:00
Henrik Rydgård
a849f1c016
Update the lang submodule
2020-03-31 00:51:40 +02:00
Henrik Rydgård
3838a1c94f
Support drawing around notches on Android displays. Fixes #12261
2020-03-31 00:47:01 +02:00
Henrik Rydgård
fcd29e9855
Merge pull request #12778 from hrydgard/android-target-29
...
Set target to Android 10 (SDK 29).
2020-03-30 23:23:52 +02:00
Henrik Rydgård
a2da6ceb47
Target Android SDK 29.
...
Includes a nasty SDK bug workaround.
2020-03-30 22:56:24 +02:00
Henrik Rydgård
8e99263949
Merge pull request #12774 from hrydgard/vulkan-shaderblend-fix
...
Vulkan: Pick shaders after calling ConvertStateToVulkanKey because it may end up disabling shader blending
2020-03-29 16:00:32 +02:00
Henrik Rydgård
21eaef04fc
Vulkan: Pick shaders after calling ConvertStateToVulkanKey because it may end up disabling shader blending
...
(due to too many copies, see DrawEngineCommon::ApplyShaderBlending).
(So much state leaking all over the place ... I want to redesign the
whole thing).
Typo fix in comment
2020-03-29 15:02:40 +02:00