c118632cde
Merge pull request #450 from Tilka/fmrx
...
Jit64: revert fmrx revert
2014-06-06 20:53:21 -05:00
e655f1fbd4
Merge pull request #467 from delroth/locale-update
...
Translation pull from Transifex
2014-06-07 01:20:06 +02:00
7291d6697e
Translation pull from Transifex
2014-06-07 01:14:56 +02:00
db08f7bf4a
Merge pull request #371 from quarnster/patch-1
...
PPCAnalyst now detects internal branches better
2014-06-06 02:45:24 -05:00
7ffea5ddc9
Merge pull request #464 from lioncash/log-str
...
Use std::string in LogContainer's constructor.
2014-06-06 00:59:22 +02:00
834bc85e1f
Merge pull request #458 from Tilka/warnings
...
Fix some warnings
2014-06-06 00:58:37 +02:00
3843848ed4
Use std::string in LogContainer's constructor.
...
This allows for removal of the strcpy calls, also it's technically way more safe, though I doubt we'll ever have a log name larger than 128 characters or a short description larger than 32 characters.
Also moved these assignments into the constructor's initializer list.
2014-06-05 18:50:14 -04:00
b780ef950c
Merge pull request #435 from YourGamesBeOver/master
...
Options for selecting which columns are visible in the game list.
2014-06-06 00:46:26 +02:00
91840cb4c7
added option for selecting which column are displayed in the game list, added optional game id column, and added config entry to disable making compressed games blue
2014-06-05 15:34:20 -04:00
318b03ec92
Merge pull request #460 from degasus/efbcache
...
OGL: speed up the EFB cache.
2014-06-05 16:28:35 +02:00
9566dcf0da
OGL: speed up the EFB cache
...
gcc doesn't optimize this loops with -O2, so using memset now.
A flag to skip the clear funktion was added as the cache is already cleared most of the time.
2014-06-05 14:53:09 +02:00
40031c9a72
Merge pull request #461 from degasus/streambuffer_opts
...
OGL StreamBuffer optimizations
2014-06-05 13:39:42 +02:00
d9eafd94a2
OGL-StreamBuffer: replace size_t with u32
...
Yes, this matters.
We align our buffer all the the time which needs a division. u64 divisions are just so slow.
2014-06-05 13:33:50 +02:00
606e46ba8d
OGL-StreamBuffer: move alignment to caller
...
Only the caller know if alignment is needed at all, so it can be skipped now.
2014-06-05 13:32:13 +02:00
02a4e3d70f
OGL-StreamBuffer: make the SLOT calculation much easier
...
The size of the buffer is now power of 2, so we can use a shift instead of a division.
This was at about 2% of the global CPU usage.
2014-06-05 13:32:13 +02:00
d81d2e8915
OGL-StreamBuffer: allocate fences in StreamBuffer directly
2014-06-05 13:32:13 +02:00
e2cfb7f0fa
Merge pull request #448 from lioncash/fifo-cleanup
...
Expand GetBPRegInfo to include the rest of the BP registers.
2014-06-05 13:21:05 +02:00
81842bc4d4
Merge pull request #462 from degasus/non-coherent
...
OGL-StreamBuffer: don't use coherent mapping.
2014-06-05 13:19:27 +02:00
0688cfdaef
OGL-StreamBuffer: don't use coherent mapping
...
Coherent mapping seems to be much slower on fermi gpus.
2014-06-05 12:18:44 +02:00
0eb341e542
Fix some warnings.
...
The 'offset' variable needs to stay because the disabled code below uses it.
2014-06-04 01:04:52 +02:00
3a06907653
Merge pull request #455 from lioncash/arm-cpudetect-fix
...
Stringify ArmCPUDetect.cpp.
2014-06-02 20:10:39 -05:00
7d7b3d6156
Stringify ArmCPUDetect.cpp.
2014-06-02 21:08:26 -04:00
b5a12dd7a2
Merge pull request #454 from Sonicadvance1/fix-android-crash
...
[Android] Fix potential crash in Video Settings.
2014-06-02 19:39:32 -05:00
7dc31fbd1a
Fix potential crash in Video Settings.
...
When Shaders folder didn't exist it would cause crash.
2014-06-02 17:57:23 -05:00
edf9af0047
Merge pull request #449 from Sonicadvance1/remove-ppcstate-mojs
...
Remove unused mojs array from ppcState.
2014-06-02 09:42:53 +02:00
2cf27e4de8
Jit64: revert fmrx revert
...
The AVX revert was not supposed to touch fmrx.
Partially reverts 2fad2a3e88
2014-06-02 08:53:02 +02:00
e0a60a40a5
Remove unused mojs array from ppcState.
...
This was some unused array just sitting in our global ppcState struct.
I've got no idea what its use was /supposed/ to be used for if ever implemented.
2014-06-02 01:39:07 -05:00
776e36b10a
Fix a typo in a BP register name (BPMEM_TX_SETLUT_4 -> BPMEM_TX_SETTLUT_4).
...
Also fixed the alignment of the register values.
2014-06-02 02:26:30 -04:00
12db989098
Add missing registers in GetBPRegInfo
2014-06-02 02:19:53 -04:00
1ef7dd68ef
Merge pull request #446 from Sonicadvance1/Memoryutil-fix
...
Make MemoryUtil.cpp use the correct x86_64 define.
2014-06-02 07:36:20 +02:00
5d3382fb56
Fix a crash in ARM's CPUDetect on a malformed /proc/cpuinfo.
...
If a CPU string was incapable of being found we would return a null pointer, which would crash with strncpy.
Also if we couldn't get a CPU implementer we would call free() to a null pointer.
In addition, detect 64bit ARM running.
2014-06-01 23:55:38 -05:00
87e671404a
Make MemoryUtil.cpp use the correct x86_64 define.
...
MemoryUtil.cpp was incorrectly using the old __x86_64__ define when it should be using _M_X86_64.
It was also using _ARCH_64 when it shouldn't have which was causing an errant PanicAlert to come up in my development.
2014-06-01 23:45:44 -05:00
31eedb2f79
Merge pull request #397 from Linktothepast/gameini_updates
...
Gameini updates.
2014-05-31 10:35:22 +02:00
8fae3d9c23
Merge pull request #412 from SeannyM/Android-Multitouch
...
Android: add multitouch support
2014-05-30 21:34:25 -05:00
568f3248f3
Android: add multitouch support
2014-05-30 19:02:28 -04:00
d0201335c6
Merge pull request #300 from Sonicadvance1/Fix-AndroidInput
...
[Android] Fixes a bunch of input bugs.
2014-05-30 15:32:08 -07:00
4fa0cf0597
More gameini updates.
...
Updates for F-Zero X (n64), Yoshi's story (n64) and Curious George (gc).
Fixes issue 7333.
2014-05-30 19:29:46 +03:00
8fc83d8ffc
Merge pull request #334 from lioncash/use-std-minmax
...
Remove the min/max functions in CommonFuncs.
2014-05-29 20:10:01 -07:00
49b0eef393
Remove the min/max functions in CommonFuncs.
...
The algorithm header has the same functions.
2014-05-29 21:44:41 -04:00
3097345929
Merge pull request #411 from lioncash/fifo-cleanup
...
Make GetBPRegInfo just take two strings as parameters
2014-05-30 01:51:11 +02:00
c96407bd2a
Make GetBPRegInfo just take two strings as parameters
...
Gets rid of the size parameters.
2014-05-29 19:44:14 -04:00
7c09f07f36
Merge pull request #399 from magumagu/bsemu-bat
...
BS2 emulation: set up a reasonable BAT during startup.
2014-05-29 15:36:28 -07:00
e9975cdd63
Merge pull request #419 from magumagu/jit-load-store-cleanup
...
Jit load store cleanup
2014-05-29 15:25:00 -07:00
fd6fd8fcf1
Merge pull request #433 from lioncash/ini
...
Get rid of the temporary buffer in IniFile's Load function.
2014-05-29 14:53:16 -07:00
3b23f4bbd6
Merge pull request #420 from magumagu/backpatch-s8
...
JIT: make backpatch handle sign-extend from 8 bits correctly.
2014-05-29 14:09:59 -07:00
329fcad04f
Merge pull request #421 from CarlKenner/MissingSpace
...
Fix error message when D3D11 HResults fail.
2014-05-29 14:06:18 -07:00
d18bc31e74
Merge pull request #429 from RachelBryk/netplay-pid
...
Make sure netplay player IDs are actually unique.
2014-05-29 14:02:24 -07:00
fee69236d5
Merge pull request #403 from RachelBryk/netplay-player-selection
...
When updating netplay player list, reselect by string instead of index.
2014-05-29 13:52:44 -07:00
eca70d1562
Get rid of the temporary buffer in IniFile's Load function.
...
std::getline is the string-based equivalent.
2014-05-28 20:26:15 -04:00
e0edf31608
Merge pull request #431 from RachelBryk/fix-ini-error
...
When reading an ini file, if there is an error, check if it is simply be...
2014-05-29 01:58:20 +02:00
Ryan Houdek