42882 Commits

Author SHA1 Message Date
Gregor Richards
b33d29aecf Make command-line overrides (somewhat) clearer
This commit:

(1) Changes the order of command-line loading so that config loading
happens before command line overrides. This way, config loading does not
itself have to be concerned with being pre-overridden.

(2) Adds overrides to the data structures that configuration saving uses
to save configuration blocks of the same type, so that they can easily
be added in the future.

(3) Corrects some (all?) existing problems with command-line overrides
being ignored.
2018-03-09 17:23:34 -05:00
twinaphex
d991c7d471 Fix warning 2018-03-09 15:44:11 +01:00
twinaphex
96e154cb8f Fixes PS3 build hopefully 2018-03-09 15:39:10 +01:00
Twinaphex
6d8544c26d
Merge pull request #6373 from ajefr/patch-2
declaration error
2018-03-09 04:02:16 +01:00
ajefr
1da67cecf3
declaration error 2018-03-08 21:44:26 +01:00
Andrés
07ecc641fe
Merge pull request #6372 from ajefr/patch-1
typo
2018-03-08 15:25:06 -05:00
ajefr
98f8ed637c
typo
stati -> static
2018-03-08 21:19:00 +01:00
twinaphex
7a99694a1a Update PS3 buildbot URLs 2018-03-08 03:45:55 +01:00
meleu
d5503e9e7c fix a bad in_addr manipulation on VITA - fixes #6127 (#6366)
added VITA condition
2018-03-07 22:11:30 +01:00
Twinaphex
1bccf5cf27
Merge pull request #6365 from Tatsuya79/patch-3
Fix MaterialUI scaling bug in long lists, lower res devices.
2018-03-07 16:07:16 +01:00
Tatsuya79
5dda583a94
Fix MaterialUI scaling bug in long lists, lower res devices. 2018-03-07 12:17:10 +01:00
Twinaphex
d532f108fc
Merge pull request #6364 from reswitched/master
[NSW] Graphics driver speed improvements/fixes and audio driver improvement
2018-03-07 06:35:39 +01:00
misson20000
35f796d65d NSW(audio): use alloc_pages to acquire buffers instead of using ones in bss 2018-03-06 21:18:42 -08:00
misson20000
e934f11065 NSW: skip frames if we can't acquire a buffer (newer libtransistors use three buffers, making this very unlikely to happen) 2018-03-06 20:55:40 -08:00
misson20000
4a4de74518 NSW(gfx): clear image row-by row for better caching (it's seriously a LOT faster), do pixel format conversion in scalers, and remove timing debug messages 2018-03-06 19:52:03 -08:00
misson20000
dd53be15ae let scalers output in ABGR8888 2018-03-06 19:52:03 -08:00
Twinaphex
82fb34a3ce
Merge pull request #6327 from ramiro/add-arab-lang-name-en-literal
Add "Arabic" to intl/msg_hash_us.h missed in 45580cb9a8.
2018-03-06 20:52:31 +01:00
twinaphex
82213266e6 (PS3) Change back to SNC 2018-03-06 19:03:51 +01:00
twinaphex
2b300b96e2 Update Makefile.ps3.cobra too 2018-03-06 18:32:00 +01:00
twinaphex
3e6ffe3983 See if this fixes PS3 builds 2018-03-06 18:31:25 +01:00
twinaphex
14e6d42935 (XMB) Get rid of some unnecessary pointer passing 2018-03-06 15:55:06 +01:00
twinaphex
aa57331569 (MaterialUI) Attempt to make things more readable 2018-03-06 15:34:58 +01:00
Twinaphex
b815c64814
Merge pull request #6355 from 777sha/master
More french translations
2018-03-06 15:33:41 +01:00
Twinaphex
2e61eecbdd
Merge pull request #6363 from reswitched/master
NSW: Menu toggle combo, build fix, graphics driver fixes
2018-03-06 12:57:42 +01:00
misson20000
90c36c52ce NSW: fix graphics driver colors for rgb32 and don't break aspect ratio when scaling menu texture 2018-03-05 23:45:28 -08:00
misson20000
22c95b31ea NSW: cpu_features_get_time_usec: put SWITCH block before POSIX_MONOTONIC_CLOCK block 2018-03-05 20:23:49 -08:00
misson20000
7487d938b3 NSW: remove global state in graphics driver, as it is no longer necessary 2018-03-05 20:14:52 -08:00
Lubosz Sarnecki
be64bf08e4 config.def.h: Toggle menu with start & select (- & +) on Switch. 2018-03-05 20:03:56 -08:00
Twinaphex
a4e2c8c75c
Update Makefile.ps3.salamander 2018-03-06 04:47:58 +01:00
Twinaphex
34ec4b9dcb
Update Makefile.ps3.cobra 2018-03-06 04:47:34 +01:00
Twinaphex
7d8e8291ec
Update Makefile.ps3 2018-03-06 04:47:16 +01:00
Twinaphex
333ef62e25
Merge pull request #6362 from aliaspider/master
update SPIRV-Cross.
2018-03-06 04:47:01 +01:00
aliaspider
bb972a6dab (spirv) set flip_vert_y to true when emitting HLSL. 2018-03-06 04:12:58 +01:00
aliaspider
ff6d24cbef (SPIRV-Cross) Merge commit 'f48c1800c0122e8e7957f572c359e4594932cd4c' 2018-03-06 04:11:59 +01:00
aliaspider
f48c1800c0 Squashed 'deps/SPIRV-Cross/' changes from 33c5cd9..c9516fa
c9516fa Fix OSX Travis.
94cd777 Move `rename_interface_variable` to util
467c956 Merge pull request #480 from KhronosGroup/fix-476
1e4db56 Run format_all.sh.
eecbeaa Take execution model into account for entry point methods.
337150f Merge pull request #479 from KhronosGroup/fix-477
3c1b147 Support Invariant for BuiltInPosition.
cae1722 Merge pull request #475 from KhronosGroup/fix-convert-cast
e69b1ae Fix implicit conversion bug.
b39c063 Merge pull request #474 from KhronosGroup/fix-pointer-overload
fda36f8 Fix function overload when SPIR-V overloads on pointer type.
a61e728 Merge pull request #472 from KhronosGroup/fix-446
6a12ff7 Fix multiple declaration of spvDet2x2 on MSL.
b380a21 Implement MatrixInverse on HLSL.
6066fe4 Merge pull request #471 from KhronosGroup/fix-462
f6d08e6 Add workaround for PointCoord builtin on HLSL.
fb196c2 Merge pull request #470 from KhronosGroup/fix-459
dd603ea Support spec constant array size in blocks.
32b1c7d Merge pull request #469 from KhronosGroup/fix-454
a04bdcc Handle overloaded functions which share the same OpName.
f887b20 Merge pull request #468 from KhronosGroup/fix-461
4543dac Run format_all.sh.
047ad7d Support special float constants (NaN/Inf).
3f64f56 Merge pull request #465 from KhronosGroup/fix-445
0673f27 Fix incorrect loop range.
114c2c5 Add clip/cull-distance support to HLSL.
fb3f92a Overhaul clip/cull distance support in GLSL.
11bbccb Merge pull request #464 from billhollings/master
50ef6cd CompilerMSL remove incorrect packing of non-interface type-aliased structs.
3925fe8 Merge pull request #460 from KhronosGroup/fix-424
47b3742 Run format_all.sh.
1a2e4de Add test for texelFetch without sampler.
4db7061 Begin implementing texelFetch(texture2D) workaround on GLSL.
d871a89 Remove "EXPERIMENTAL" tag from MSL/HLSL.
218b0a5 Merge pull request #455 from KhronosGroup/fix-452
8a3bef2 Add OpFRem tests.
54a065b Run format_all.sh.
3fa6cc8 Implement FRem.
a9a6bca Merge pull request #453 from KhronosGroup/fix-444
843e34b Add IsFrontFace support to HLSL.
3d0c61f Merge pull request #451 from KhronosGroup/fix-437
636cc30 Fix case where hoisted temporaries were used before being declared.
4d1c5ad Merge pull request #450 from jodavis42/OpCopyMemoryCrash
b4b629b Null crash fix in OpCopyMemory.
6a0f698 Set width when creating NumWorkgroups buffer.
2bda0d5 Merge pull request #449 from billhollings/master
2964e32 CompilerMSL support gl_SampleMask and convert it to scalar uint from array.
64d3083 Merge pull request #448 from billhollings/master
b453348 Merge branch 'master' of https://github.com/billhollings/SPIRV-Cross
607b0d6 CompilerMSL support smaller offsets for 3-row row-major matrices.
7be30aa Merge pull request #442 from KhronosGroup/fix-435
a3104e9 Also check that type we load is an image.
a3ae861 Fix depth image usage in MSL for separate image/samplers.
702e086 Support passing implicit frag_coord arguments down to functions.
0912427 Begin implementing subpassLoad in MSL.
18a594a Implement subpass input support in HLSL.
f4bce68 Merge pull request #433 from KhronosGroup/fix-428
c9db3e5 Overload on constant storage.
b2c9487 Attempt to deduce constant/thread storage.
1a9c960 MSL cannot declare inline arrays except in certain cases.
156dd90 Implicit return value takes thread storage.
d89b790 Fix wrong function declaration in MSL.
00ccd59 Return arrays in HLSL/MSL by writing to an output variable instead.
9fa91f7 Support returning arrays from functions in GLSL/MSL.
ed6b775 Merge pull request #417 from msiglreith/root_constants_overwrite
369f5f6 Add missing include
d096f5c hlsl: Support custom root constant layout
4b58f65 Merge pull request #438 from zeux/msvc-warning-fix
24cf308 Fix MSVC 2015 warning
8b53b70 Merge pull request #434 from KhronosGroup/fix-429
18e8833 Support gl_NumWorkgroups in HLSL.
181a5fa Fix formatting after merge.
e3f4041 Fixes MSVC 2013 compilation
ef33770 Merge pull request #431 from twinaphex/master
59a12c7 Uniquely name these static functions

git-subtree-dir: deps/SPIRV-Cross
git-subtree-split: c9516fa91709b68ac20fa614625e85e0ced3f23f
2018-03-06 04:10:13 +01:00
Twinaphex
c104a232fd
Merge pull request #6361 from FIX94/master
(GX) allow audio output rate to be changed in the settings
2018-03-05 20:45:12 +01:00
FIX94
13a2246c50
(GX) allow audio output rate to be changed in the settings between 32khz and 48khz 2018-03-05 20:17:51 +01:00
Hugo Sha
810be0cea5 More fixes 2018-03-04 23:25:50 +01:00
Hugo Sha
7c1ee8b24b Added changes recommended by Tatsuya79 3 2018-03-04 22:33:33 +01:00
Twinaphex
d51048b0df
Merge pull request #6358 from fr500/subsystem
subsystem part 4: set savestates properly
2018-03-04 21:09:56 +01:00
Hugo Sha
f3c3bc9f6e Some more changes 2018-03-04 19:59:28 +01:00
Hugo Sha
29c75105d4 Added changes recommended by Tatsuya79 2 2018-03-04 19:44:55 +01:00
Hugo Sha
fc4a24e4c9 Added changes recommended by Tatsuya79 2018-03-04 19:34:57 +01:00
radius
7b0c0b63c9 subsystem part 4: set savestates properly 2018-03-04 12:34:51 -05:00
Twinaphex
32bf9cd716
Merge pull request #6356 from GregorR/netplay-no-double-check
Remove an incorrect double-check
2018-03-04 05:46:11 +01:00
Gregor Richards
a39bff6e03 Remove an incorrect double-check
Netplay sync incorrectly checked whether the replay pointer was behind
the unread pointer twice, when in the second check it should only have
been checking if it was behind the current execution pointer. Because of
how resimulation works with device sharing, I THINK this could affect
sync. Even if it can't, it's wrong.
2018-03-03 23:03:35 -05:00
Twinaphex
112600e0db
Merge pull request #6354 from Tatsuya79/patch-1
Move variable.
2018-03-04 02:51:24 +01:00
Hugo Sha
03e0d0fe99 More french translations 2 2018-03-04 02:26:01 +01:00
Tatsuya79
4c561a2de1
Move variable. 2018-03-04 01:56:29 +01:00
Twinaphex
340a368465
Merge pull request #6340 from Tatsuya79/master
XMB Dynamic Scaling Mod. (For Testing)
2018-03-04 01:08:59 +01:00