Markus Wick
4b5995a6e0
Merge pull request #5138 from lioncash/init
...
VertexLoaderBase: In-class initialize class members where applicable
2017-03-23 15:15:32 +01:00
Lioncash
da2e34f69b
VertexLoaderBase: In-class initialize class members where applicable
...
Same thing, less code.
2017-03-23 08:37:18 -04:00
Lioncash
a7ec2d3831
Arm64Emitter: Get rid of pointer casts in PoisonMemory
...
The previous code invokes undefined behavior.
2017-03-23 07:10:21 -04:00
Markus Wick
6d065a02b5
Merge pull request #5134 from degasus/texture_cache
...
TextureCache: Don't lock freed rendertargets for one frame.
2017-03-23 09:48:32 +01:00
Matthew Parlane
6a17d87b07
Merge pull request #5136 from lioncash/ar
...
ARDecrypt: const correctness
2017-03-23 14:45:48 +13:00
Lioncash
1d6d85963f
ARDecrypt: const correctness
2017-03-22 20:35:00 -04:00
Lioncash
29ca22905b
IniFile: Replace a character erase with pop_back()
...
Same thing, more straightforward.
2017-03-22 19:32:10 -04:00
Lioncash
35959bdaf9
IniFile: Replace string joining code with JoinString
2017-03-22 19:30:15 -04:00
Lioncash
b92871111a
IniFile: std::move a std::string in GetLines
...
Also gets rid of an unnecessary string copy.
2017-03-22 19:09:25 -04:00
Lioncash
dbdf693c81
IniFile: Use character literals instead of string literals where applicable
...
Character overloads are generally better overall (range checks aren't
necessary, etc).
2017-03-22 19:03:17 -04:00
Lioncash
d8998b6392
IniFile: Provide an rvalue reference overload for SetLines
...
Allows moving in vectors instead of performing an unnecessary copy.
2017-03-22 18:49:13 -04:00
Lioncash
46d74a7760
IniFile: Make Section's string constructor instances take strings by value
...
As the name is immediately stored into a class member, a move here is a
better choice.
This also moves the constructor implementations into the cpp file to
avoid an otherwise unnecessary inclusion in the header. This is also
likely a better choice as Section contains several non-trivial members,
so this would avoid potentially inlining a bunch of setup and teardown
code related to them as a side-benefit.
2017-03-22 18:47:19 -04:00
degasus
ca8d9e2215
TextureCache: Don't lock freed rendertargets for one frame.
...
New Super Mario Bros on PAL still renders at 60 fps, but skips every 5th XFB copy.
So our detection of "per frame" fails, and we require twice the amound of texture objects.
But our pool frees unused textures after 3 frames, so half of them needs to be reallocated
every few frames.
This commit removes the lock for render targets. It was introduced to not update a texture
while it is still in use. But render targets aren't updated while rendering, so this
lock isn't needed. Non-rendertarget textures however aren't as dynamic, so the lock should
have no performance update.
2017-03-22 23:28:42 +01:00
Lioncash
99adc73383
IniFile: Make Section constructor explicit
2017-03-22 18:07:23 -04:00
Markus Wick
9ea59133b3
Merge pull request #5121 from MerryMage/children-happen
...
Jit64: Merge memory allocations into a single allocation
2017-03-22 22:42:46 +01:00
Michael Maltese
c4bb452f2b
InputConfigDiagBitmaps: add switch empty cases (fixes warning)
...
Fixes warning:
```
dolphin/Source/Core/DolphinWX/Input/InputConfigDiagBitmaps.cpp:170:13: warning: 7 enumeration values not handled in switch: 'Other', 'MixedTriggers', 'Buttons'... [-Wswitch]
switch (g->control_group->type)
^
```
2017-03-22 13:00:54 -07:00
Matthew Parlane
8804f759b9
Merge pull request #5127 from lioncash/gcode
...
GeckoCodeConfig: Minor changes
2017-03-23 07:13:45 +13:00
Markus Wick
09f4d494ef
Merge pull request #5132 from ligfx/commentoutpagetagshift
...
MMU: comment-out unused var HW_PAGE_TAG_SHIFT
2017-03-22 09:43:45 +01:00
Michael Maltese
da6a1daef6
MMU: remove unused var HW_PAGE_TAG_SHIFT
...
It's not used, so produces a warning during compilation.
2017-03-21 23:47:10 -07:00
Michael Maltese
9e430cbdd6
Breakpoints.cpp: fix format string warnings
...
Fixes warnings:
```
dolphin/Source/Core/Core/PowerPC/BreakPoints.cpp:246:89: warning: format specifies type 'int' but the argument has type 'unsigned long' [-Wformat]
debug_interface->GetDescription(pc).c_str(), write ? "Write" : "Read", size * 8,
^~~~~~~~
dolphin/Source/Core/Core/PowerPC/BreakPoints.cpp:245:50: warning: field width should have type 'int', but argument has type 'unsigned long' [-Wformat]
NOTICE_LOG(MEMMAP, "MBP %08x (%s) %s%zu %0*x at %08x (%s)", pc,
~~~^
```
2017-03-21 23:25:17 -07:00
Lioncash
2f52d04e30
GeckoCodeConfig: Use compare instead of substr for comparing substrings
...
Gets rid of an unnecessary string construction.
2017-03-21 18:12:40 -04:00
Matthew Parlane
a32a2d1a02
Merge pull request #5126 from leoetlino/version
...
UICommon: Don't print --version option twice
2017-03-22 11:10:36 +13:00
Lioncash
0d0e9f626d
GeckoCodeConfig: Amend unnecessary string literals to char literals
...
Also gets rid of an unnecessary std::string construction in a loop.
std::string already has an operator+ overload to prepend characters.
2017-03-21 18:03:06 -04:00
Lioncash
28235b5cb6
GeckoCodeConfig: Remove unused commented out code
2017-03-21 18:03:06 -04:00
Lioncash
f0fa692457
GeckoCodeConfig: Move gecko code title building to its own function
...
Keeps it separate from the rest of the saving code and also allows for
easy rvalue-reference moving into the lines vector as a side-benefit.
2017-03-21 18:03:02 -04:00
Léo Lam
3028158873
UICommon: Don't print --version option twice
...
cpp-optparse already has the --version option built-in, so having our
own version option results in --version being shown twice.
2017-03-21 22:29:01 +01:00
JosJuice
3be5373768
Merge pull request #5125 from lioncash/gcode
...
GeckoCodeConfig: Return vector by value for LoadCodes()
2017-03-21 22:03:05 +01:00
Lioncash
f91292eff2
GeckoCodeConfig: Return vector by value for LoadCodes()
...
Using an out-param is a leftover from C++03. Action Replay codes already
return the vector of codes by value as well.
2017-03-21 16:58:13 -04:00
Michael Maltese
7c52b8f838
WiimoteEmu: refer to settings by name, not index
...
Fixes https://bugs.dolphin-emu.org/issues/10159 "Emulated Wii remote
options not working correctly," which was introduced by PR #4856 : "Move
'Background Input' out of individual controller configurations."
2017-03-21 13:31:42 -07:00
MerryMage
cb7d9556bf
Jit64: Merge memory allocations into a single allocation
...
Instead of each component allocating their own memory, we instead allocate
the memory once and divvy that up among the components as required. This
ensures that relative memory offsets remain within architecture limits.
2017-03-21 20:16:12 +00:00
MerryMage
da434e1a1c
ConstantPool: Externalize memory allocation
2017-03-21 20:16:12 +00:00
MerryMage
615fcc621d
CodeBlock: Add support for multiple children
2017-03-21 20:16:12 +00:00
Markus Wick
9ea255c04d
Merge pull request #5122 from lioncash/init
...
FifoPlayer: In-class initialize member variables where applicable
2017-03-21 21:00:45 +01:00
Lioncash
780dffcb13
FifoDataFile: In-class initialize member variables where applicable
2017-03-21 15:41:05 -04:00
Lioncash
4e5e7cff0a
FifoRecorder: In-class initialize member variables where applicable
2017-03-21 15:41:05 -04:00
Lioncash
eda27ee397
FifoPlayer: In-class initialize member variables where applicable
2017-03-21 15:40:56 -04:00
Markus Wick
5854047e3a
Merge pull request #5120 from lioncash/const
...
JitBase: Make MergeAllowedNextInstructions a const member function
2017-03-21 20:16:26 +01:00
Lioncash
0d1bc53e55
JitBase: Rename MergeAllowedNextInstructions to CanMergeNextInstructions
...
This is more indicative that it's checking for something
2017-03-21 13:50:03 -04:00
Lioncash
f98211bfcf
JitBase: Make MergeAllowedNextInstructions a const member function
2017-03-21 13:45:18 -04:00
Markus Wick
f03fa54bcb
Merge pull request #5116 from degasus/ArmRegCache
...
JitArm64: Fix usages in conditional code.
2017-03-21 18:14:16 +01:00
Markus Wick
fc2c9d853f
Merge pull request #5119 from MerryMage/JitAsm
...
JitAsm: Add missing forward declaration of X64CodeBlock
2017-03-21 18:06:45 +01:00
MerryMage
8a788ebdd9
JitAsm: Add missing forward declaration of X64CodeBlock
2017-03-21 16:56:43 +00:00
Anthony
d2690568f9
Merge pull request #5110 from MerryMage/const-pool
...
Jit64: Implement a constant pool
2017-03-20 13:29:57 -07:00
MerryMage
4491e9b829
Jit_SystemRegisters: Add missing sizes to constant arrays
2017-03-20 20:21:43 +00:00
MerryMage
9058ccea3f
IR_X86: Use MConst for constants
2017-03-20 20:21:43 +00:00
MerryMage
3dccc369d3
Jit64AsmCommon: Use MConst for constants
2017-03-20 20:21:43 +00:00
MerryMage
4814c4ac5a
EmuCodeBlock: Use MConst for constants
2017-03-20 20:21:43 +00:00
MerryMage
8b93baefb7
Jit_SystemRegisters: Use MConst for constants
2017-03-20 20:21:43 +00:00
MerryMage
0fe234ec9b
Jit_FloatingPoint: Use MConst for constants
2017-03-20 20:21:42 +00:00
MerryMage
ff441efc26
EmuCodeBlock: Use ConstantPool
2017-03-20 20:21:42 +00:00