2316cb6876
Remove all tab/space mismatches from the Core project. For anyone working on a branch that heavily involves the core, I am so sorry.
...
- Also killed off some trailing spaces/tabs.
- Updated the license header to be consistent with the rest of the project (All projects are now done moving over to this)
- Also, killed some dangling else's (where appropriate)
Now all the tab fixing is done. No more of this crap should be needed to be pushed. Rejoice!
2013-04-16 23:14:36 -04:00
f498686289
Merge branch 'VBeam-fix'
...
* VBeam-fix:
Renamed the VBeam variable for clarity.
Fixed VBeam emulation in interlaced mode, removing the hacks in the audio timing. Fixed VBeam emulation in progressive scan mode. Retained the old VBeam speed hack. This option has now been switched so that the accurate behaviour is on by default and the speed hack (inaccurate behaviour) is enabled when the option is checked.
2013-04-16 21:21:40 +10:00
71828e02f7
Renamed the VBeam variable for clarity.
2013-04-16 21:18:53 +10:00
8bb845e646
Buildfix for the last commit.
2013-04-15 16:40:48 -04:00
ef85b9af45
Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project.
...
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.
Now, the Core is literally the only project with tab/space mismatches (on a large scale).
2013-04-15 16:28:55 -04:00
61c11284ea
Fixed VBeam emulation in interlaced mode, removing the hacks in the audio timing.
...
Fixed VBeam emulation in progressive scan mode.
Retained the old VBeam speed hack. This option has now been switched so that the accurate behaviour is on by default and the speed hack (inaccurate behaviour) is enabled when the option is checked.
2013-04-15 20:23:25 +10:00
a44fb7bdd0
Android Related - A tiny simplification/readability change for NativeListView.
...
In this case, contains functions pretty much the same way, just more readable.
2013-04-15 00:52:43 -04:00
7772f0d071
Merge branch 'Android-trash' since it is no longer quite so trashy.
2013-04-14 23:36:00 -05:00
44bbb54a62
Add a Androind ControllerInterface class for allowing input in a non-hacky way. Add a default GCPad.ini file so it actually works.
2013-04-14 23:02:53 -05:00
8a9fcd3014
Kill off dangling else's in the InputCommon project.
...
Some indentations were also too far for some things. Fixed this.
Also update the license header to show Git instead of SVN.
Got rid of some trailing spaces/tabs too.
2013-04-14 22:53:10 -04:00
37b67971e7
Merge remote-tracking branch 'origin/master' into Android-trash
...
Conflicts:
Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp
2013-04-14 20:43:42 -05:00
bde7ea00ef
Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp
2013-04-14 20:39:56 -05:00
7768b6f960
DSPJIT: Fix movToHostReg usage
2013-04-14 13:34:29 +02:00
9299026572
DSP: fix for interpreter, jit ADDP
...
should probably use carry, not carry2
2013-04-14 13:34:29 +02:00
5cbe75b389
DSPJIT: fix increase/decrease_addr_reg to match interpreter again
2013-04-14 13:34:29 +02:00
d3de29c673
DSPJit: fix bug in DSPJitRegCache::getXReg
2013-04-14 13:34:29 +02:00
6b5b8ab5be
Implement and use MOVZX(64, 32,...)
...
Probably better to keep that same-register-MOV assert useful. Also,
explicit type extension documents whats happening.
Internally, this boils down to the original MOV, but without the assert.
2013-04-14 13:34:29 +02:00
701b5916ab
Revert "In memory of calc84."
...
This reverts commit 539bf405f2
2013-04-14 13:34:29 +02:00
9c1d18a14c
DSP/Jit: Some small optimizations to lsrn emitter
2013-04-14 13:34:29 +02:00
6873443a9a
DSPJIT: RegCache: Fix writing immediates to guest registers
2013-04-14 13:34:29 +02:00
5440ddde14
DSP: regcache: Synch host regs back to previous state
...
only if we are told to not emit the fixup to get it to that state
2013-04-14 13:34:28 +02:00
a902c720e0
DSP/Jit: Fold the test for ACMx into dsp_op_read_reg()
...
adds a new dsp_op_read_reg_dont_saturate for the few cases where
saturation is not appropriate
2013-04-14 13:32:13 +02:00
54f3828555
DSPLLE: Move a bunch of helper functions from DSPJitMisc.cpp to DSPJitUtil.cpp
2013-04-14 12:05:03 +02:00
b91930a2d4
Really minor LogInfo consistency fix in ActionReplay.cpp.
...
All the other [bit size] Write LogInfo calls had a hyphen in the text.
2013-04-14 00:17:22 -04:00
7ab0cca645
Clean up most (99.99%) of the tab/space mismatches in the VideoSoftware project.
...
Got rid of trailing spaces that were unnecessary too.
Also update the license header for this project. We don't use SVN anymore.
2013-04-13 23:54:02 -04:00
24347e5176
Get latest android cmake to support NDK 8e
2013-04-13 15:09:05 -05:00
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
48927c17d2
Good job Windows. Stop choosing the same names as I do.
2013-04-13 00:54:11 -05:00
39a7096711
Extend our OSD class to support callbacks on init, onframe, and shutdown.
2013-04-13 00:48:53 -05:00
ccf1cee203
Implement a few more store instructions on ARM
2013-04-13 05:02:27 +00:00
62adcaf552
Fix fastmem on ARM
2013-04-12 20:19:42 +00:00
6d9c0c8863
Merge in latest changes to ArmEmitter from the PPSSPP crew. Should fix the dumb random crashes I had from IOS icache clearing not initializing a value.
2013-04-12 11:59:19 -05:00
2c722bb04f
GOOGLE CODE, STOP BEING CRAP please :(
2013-04-12 02:46:30 +00:00
71a1ae3a16
Make debug builds use unicode, not multibyte.
2013-04-12 02:44:48 +00:00
ef4d59a21e
Refactored the SystemTimers to allow for per-UCode timing. Fixes issue 6237.
2013-04-12 12:08:05 +10:00
addd3926d9
ogl: remove GL_TRIANGLE_FAN on utils rendering
...
wtf have I done? fans aren't supported well on hardware
2013-04-11 16:27:32 +02:00
7e630ba920
Merge branch 'primitive_restart'
2013-04-11 14:01:58 +02:00
3c87512180
ogl: fix single core crash
...
osx is missing, sorry but I'm too stupid for objective-c
2013-04-11 03:32:07 +02:00
7480f5dfd6
ShaderGenCommon: Clean up.
2013-04-10 14:55:46 +02:00
6af14bd4ce
DolphinWX: Fail less at explaining what framelimit is doing.
2013-04-10 12:52:13 +00:00
e7a5847c30
ShaderGen: Build fix.
2013-04-10 14:44:09 +02:00
abde070f63
LightingShaderGen: Use a float4 array for lights instead of a struct (uniform management in the non-UBO path is a mess otherwise).
...
Also fix a small bug (cf. revision 154c533e76
2013-04-10 14:25:18 +02:00
26b428539a
small cleanup suggested by neobrain
2013-04-10 14:12:35 +02:00
154c533e76
VertexShaderGen: Fix a small GLSL regression in emboss mapping.
2013-04-10 11:44:49 +00:00
fab4f1d0a5
LightingShaderGen: Improve code flexibility.
2013-04-10 13:38:31 +02:00
b9ba82ec03
proper ogl primitive restart code
2013-04-10 12:58:52 +02:00
31d2cab8d3
Add ShaderGenCommon to vcproj file list.
2013-04-10 12:55:42 +02:00
ec08914905
Move Shader UID mismatch checking to VideoCommon.
2013-04-10 12:54:22 +02:00
1aa10b579a
fix triangle_fan size calculation
...
wasn't updated for the new primitive restart implementation
2013-04-10 12:45:44 +02:00
a6412f7bd4
render a triangle for a 3 vertice quad
...
fix issue 6214
2013-04-10 12:36:59 +02:00
Lioncash