Rachel Bryk
10d1d19409
Set graphics settings while playing a movie in UpdateActiveConfig(), so settings can't be changed for a frame.
2013-05-21 19:20:22 -04:00
Matthew Parlane
86b4a87fef
Merge branch 'wii_bb'
...
Adds Balance Board support.
2013-05-21 23:34:58 +12:00
Matthew Parlane
d642abce46
Only show 4 config dialogs in wiimote config.
2013-05-21 23:31:41 +12:00
Matthew Parlane
f178015461
Better checking for extension.
2013-05-21 22:54:01 +12:00
Matthew Parlane
e2b0632334
Added a method for detecting Wiimote extension.
...
This is run before a Wiimote will be considered.
2013-05-21 21:42:19 +12:00
Ryan Houdek
f8a5d05c07
[Android] Redo the Settings menu, Can now change the CPU Core, dual core setting, and video backend in the settings"
2013-05-20 02:59:12 -05:00
John Peterson
9a1b9e9b3b
Removing ISO ini presence requirement for reading movie settings
...
because it's not necessary for running a movie
2013-05-19 19:47:32 +02:00
Ryan Houdek
252edb942d
[Android] Beginning of setting menu, doesn't do anything yet.
2013-05-19 05:25:02 -05:00
Matthew Parlane
56976ad6ea
Fix coding style.
2013-05-19 14:57:04 +12:00
Matthew Parlane
065d772696
Windows should have support for Balance Board now.
...
Needs to be tested.
2013-05-19 14:45:24 +12:00
Matthew Parlane
7208823396
Added config for enabling Balance Board.
...
Fixed other structures that still assumed 4 of everything.
2013-05-19 00:30:20 +12:00
Matthew Parlane
59924d0291
It never had logging here anyway...
2013-05-18 22:31:22 +12:00
Matthew Parlane
08f6ba8274
I'm bad at mac.. sorry.
...
Used the correct name string.
2013-05-18 22:29:51 +12:00
Matthew Parlane
0b869cf12d
Add mac support for balance board.
2013-05-18 22:26:00 +12:00
Ryan Houdek
10018cfe9a
[Android] Add in the Android Studio project files so one can use Android Studio instead of ADT.
2013-05-18 04:04:07 -05:00
Ryan Houdek
2c7f9b1b78
[Android] Copy over the Dolphin shared library to the Android APK build directory so it doesn't need to be manually copied each time.
2013-05-18 03:56:45 -05:00
Matthew Parlane
fccf377180
Fix IODummy FindWiimote method.
2013-05-18 20:35:37 +12:00
Matthew Parlane
19252f4e0e
Initial commit with balance board working on Linux.
...
Will not work on any other platform currently.
Missing any sort of config, and definitely no emulation mode.
2013-05-18 20:31:37 +12:00
Ryan Houdek
39c9516197
[Android] Qualcomm driver has a bug where it returns an invalid length for GL_INFO_LOG_LENGTH with glGetShaderiv. Qualcomm drivers seem to max out at ~512bytes returned from glGetShaderInfoLog so this is a reasonable max.
2013-05-17 21:13:02 -05:00
Ryan Houdek
c30d00e904
[Android] Support DFF files in the interface.
2013-05-17 21:13:02 -05:00
degasus
a905b18ef1
Merge branch 'ppd' - per pixel depth
...
use always ppd is a huge gpu performance drop: 20%-50%
and always disable it cause some rendering issues
so there is an option again
But this time it's called "Fast Depth Calculation"
2013-05-12 07:29:31 +02:00
Ryan Houdek
bf67378812
Fix the integer compare in our GLSL fmod function
2013-05-11 00:16:20 -05:00
Pierre
82cd91e944
DSPJIT: the shift value must still be loaded into the correct register
...
Fixes issue 6295
2013-05-10 20:12:49 +02:00
NeoBrainX
f348712d3a
BPMemory: Fix a small documentation mistake from revision 9365187f89
.
2013-05-10 11:47:06 +00:00
degasus
f7c3cacb5c
ppd: fix small issues in my last commit
2013-05-10 12:51:06 +02:00
degasus
89be1cbf51
recreate "per pixel depth" option and renamed it to fast depth calculation
2013-05-09 17:48:48 +02:00
skidau
98e8f8d7d0
Forced an external exception check on DI interrupts. Fixes Summoner: A Goddess Reborn.
...
Fixes issue 6301.
2013-05-10 00:03:00 +10:00
degasus
c7486609fa
fix underflow in IndexGenerator::AddFan
...
fix issue 6282
The Last Story seems to render a fan with two vertices. It is non-sense as it
shouldn't do anything, but the code underflows at (u32)numVerts-3
2013-05-09 10:17:12 +02:00
NeoBrainX
9365187f89
BPMemory: Add register documentation for texture source adress and EFB configuration.
2013-05-06 22:20:17 +02:00
NeoBrainX
6871cc9700
FifoPlayerDlg: Improve navigating through search results.
2013-05-06 22:20:17 +02:00
Ryan Houdek
0247b2a97a
[Android] More GLES3 things. Disable Framedumping and MSAA rendering. Remove the HLSL->GLSL shader defines since Qualcomm doesn't support this in their shader compiler. Now they get chosen in our shader generator instead.
2013-05-06 06:43:04 -05:00
Ryan Houdek
5ac58a34ea
[Android] Beginning of GLES3 support.
2013-05-05 23:37:02 -05:00
Ryan Houdek
cb5b9c0327
[Android] Add GLSLES3 to the GLSL version enums. Add in the version and precision qualifier to the shader header.
2013-05-05 23:37:02 -05:00
Ryan Houdek
028a1a4971
GL_DEPTH_COMPONENT can't have type of GL_UNSIGNED_BYTE with glTexImage2D. Qualcomm drivers get hit with this but all else don't care.
2013-05-05 23:37:02 -05:00
Ryan Houdek
b6963ce1cb
[Android] Use vsnprintf for the log messages.
2013-05-05 23:37:01 -05:00
Ryan Houdek
09def3ed3f
[Android] Add in a compiling option for GLES3
2013-05-05 23:37:01 -05:00
Ryan Houdek
b2d3dc8a68
[Android] Allow the user to select multiple browse paths.
2013-05-05 23:37:01 -05:00
Glenn Rice
12d791a628
Fix some of the compiler warnings that have appeared recently.
2013-05-05 23:22:57 -05:00
John Peterson
46cd91dc0d
Build fix
2013-05-05 21:23:16 +02:00
Rachel Bryk
7d74e30423
Merge remote-tracking branch 'john-peterson/cheat2'
2013-05-05 14:53:10 -04:00
John Peterson
7cc2e3146b
Updating Cheats manager when the ISO is changed etc.
...
The Cheats manager should be updated when the ISO is changed because it's non-modal
Removing code that read the ID from file because the cheats manager only has a use when an emulation is running (when the ID doesn't need to be read from the ISO again because it's in a variable). This fixes loading Gecko codes for .wad during an emulation because "VolumeHandler::GetVolume()" return false in this case
2013-05-05 12:25:53 +02:00
degasus
a295a3eb56
ogl: report shader compilation issues in the same way as other backends
2013-05-04 23:30:13 +02:00
skidau
719f18a122
Forced an exception check on short ARAM DMA transfers.
2013-05-04 00:19:02 +10:00
skidau
18b0556e0d
Immediately process ARAM DMA transfers if they are 1 block in length. Fixes the teleportation in Beyond Good and Evil.
...
Fixes issue 6289.
2013-05-03 23:20:48 +10:00
LPFaint99
c80309ee1a
GCMemcard: Initialize the current/previous DIR BAT pointers when creating a new memory card fixes issue 6288
2013-05-01 11:28:02 -07:00
skidau
8bcd9a74c8
Clear the texture cache when a new dol is loaded via ES_LAUNCH. Fixes the black screen in The House of the Dead 2.
...
Abbreviated some of the information in the window titlebar.
2013-05-01 23:51:43 +10:00
lioncash
c2859a5207
Dammit Ctrl-Z. Restore a wxSpinCtrl parameter that accidentally got removed in the last commit.
2013-05-01 09:41:45 -04:00
lioncash
fbc77e956a
Display the initial number of frames that are to be recorded in the Fifo Player.
...
Before this commit, nothing would would be displayed in the "Frames to Record" text control.
This fixes that by setting it to what m_FramesToRecord is initially set to, which is 1 (at the time of this commit).
2013-05-01 09:35:31 -04:00
lioncash
62065be788
Fix a bug where FIFO recording could not work.
...
Example (in step by step explanation):
1. Run Dolphin.
2. Go to Tools -> Fifo Player
3. Go to the Record tab and hit record and then stop without a game loaded.
The button is now disabled and will not become active again for the whole time that Dolphin is running. Dolphin must be closed and then re-opened in order to use it again. This fixes that.
I've tested it with multiple conditions to make sure this doesn't beef anything else related to the Fifo Player.
ie)
- Record then Stop without a game loaded (multiple times)
- Record then Stop with a game loaded (multiple times, as well as testing playback. All of which work fine).
2013-05-01 09:05:37 -04:00
NeoBrainX
2c7ed2a793
Apply color mask when alpha test parameters change. Required to make the changes in revision be706a3977
work properly.
...
Fixes issue 6080.
2013-05-01 11:50:37 +02:00
skidau
e70a277af2
Added Dance Mat support for the Family Trainer/Active Life series.
...
Select the dance mat via Configure > Gamecube > Port 1 > Dance Mat
The dance mat is mapped to the GC Pad:
D-Pad Up = Blue Arrow Up
D-Pad Down = Blue Arrow Down
D-Pad Left = Blue Arrow Left
D-Pad Right = Blue Square
Y Button = Orange Arrow Up
A Button = Orange Arrow Down
X Button = Orange Arrow Right
B Button = Oranage Square
2013-04-30 23:36:46 +10:00
Rachel Bryk
e5fdd301a9
Merge remote-tracking branch 'John-Peterson/state'
2013-04-29 22:32:08 -04:00
John Peterson
ef2e0a87d0
Adding option to save and load state by timestamp
...
Load by timestamp: load last state is expanded from 1 to 8 actions, for newest to oldest state
Save by timestamp: overwrite the oldest state (or use an empty slot if available)
Adding remaining hardcoded state keys to hotkey dialog
Adding a program exit hotkey
2013-04-30 04:13:55 +02:00
NeoBrainX
76a316ffab
Don't exit when bluetooth support is not available on Windows.
...
Fixes running Dolphin in Wine and on regular Windows setups where bthprops.cpl is not available.
Fixes issue 6283.
2013-04-29 21:32:13 +02:00
NeoBrainX
9cb263ad48
PixelShaderGen: Set some uid fields that I missed before.
2013-04-29 21:19:48 +02:00
NeoBrainX
02afec5076
Polish shader uid checking.
2013-04-29 21:00:39 +02:00
NeoBrainX
77dae3496a
PixelShaderGen: Cleanups.
2013-04-29 19:52:12 +02:00
NeoBrainX
adab4e37f7
Fix some mistakes from the master merge; some cleanups.
2013-04-29 19:37:32 +02:00
John Peterson
8dbe236606
Fixing or disabling the "Download Codes (WiiRD Database)" button problem
...
The "Download Codes (WiiRD Database)" button is enabled (and its click return silently without an effect) when "Tools → Cheats Manager" is opened when there's a running emulation for which there's no "[Gecko]" ini section, confusing the user about the reason for not downloading codes or showing an error when there's no running emulation
Solution
when there's a running emulation: fix the button
when there's no running emulation: disable the button (to indicate to the user that this button must be clicked elsewhere, in the ISO settings dialog, the user will realise or remember)
2013-04-29 12:00:23 -04:00
Glenn Rice
4f5832827e
Merge branch 'fix-linux-win-resize'
2013-04-26 12:04:09 -05:00
Glenn Rice
2c8c6304d7
Make sure the EGL evdpy is closed.
2013-04-26 11:35:42 -05:00
Glenn Rice
1666e091ef
Make EGL and X11 dpy/evdpy usage consistent. EGL needs testing.
2013-04-26 10:53:46 -05:00
Rachel Bryk
5afceca7a1
Apparently we can't trust m_strVideoBackend on osx.
2013-04-26 02:47:49 -04:00
Glenn Rice
03dfe7b816
The evdpy should be used for the X11 window creation and in the event
...
thread. dpy should only be used for GL.
2013-04-25 23:41:45 -05:00
Rachel Bryk
3b732f695d
Show video backend and audio engine in title bar.
...
Fixes issue 6276.
2013-04-25 19:59:08 -04:00
NeoBrainX
5e6b712651
Merge 'master' into shader-uids-awesome.
...
Conflicts:
Source/Core/VideoCommon/Src/BPMemory.h
Source/Core/VideoCommon/Src/LightingShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.cpp
Source/Core/VideoCommon/Src/PixelShaderGen.h
Source/Core/VideoCommon/Src/PixelShaderManager.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.cpp
Source/Core/VideoCommon/Src/VertexShaderGen.h
2013-04-25 14:05:54 +02:00
NeoBrainX
eef95fa4c5
ShaderGenCommon: Adding documentation.
2013-04-25 13:30:41 +02:00
Matthew Parlane
d18b71ccf9
Back to broken ES_launch but 4 wiimotes working.
2013-04-25 15:28:42 +12:00
Matthew Parlane
7c50ac931d
Update before enqueue.
2013-04-25 14:37:12 +12:00
Matthew Parlane
a2b543d47f
request_queue may not have anything in it on return from ExecuteCommand
...
i.e. when calling ES_Launch and everything is reset.
Don't call Update after queuing a request.
2013-04-25 14:24:05 +12:00
degasus
673d256f45
glew1.8 debug build fix
2013-04-24 16:24:55 +02:00
Ryan Houdek
87331fcef5
Change Android project name to dolphin emulator
2013-04-24 09:00:14 -05:00
Lioncash
9ee3a30878
Remove something that slipped through the last commit.
...
Don't even know why that was there.
2013-04-24 09:55:12 -04:00
Lioncash
bd284f1468
[Android] WINDOW_SERVICE should be accessed statically.
...
(it's a static final variable in the Context class, so... yeah).
2013-04-24 09:48:11 -04:00
Matthew Parlane
62ebfa0a78
Probably breaks a "fixed" issue..
2013-04-25 01:39:33 +12:00
Lioncash
8da425b008
Formatting cleanup for VideoCommon.
...
Block braces on new lines.
Also killed off trailing whitespace and dangling elses.
Spaced some things out to make them more readable (only in places where it looked like a bit of a clusterfuck).
2013-04-24 09:21:54 -04:00
Matthew Parlane
c118c71eac
ES needs to handle it's own reply.
...
pDevice was being used after free otherwise.
2013-04-25 01:11:36 +12:00
degasus
4a48485482
Revert "Revert "Fix performance issues on certain legacy graphics hardware that isn't capable of copying an integer.""
...
This reverts commit 8b7141d3de
.
GLSL120 can't handle integer attributes :-(
2013-04-24 03:03:52 +02:00
Ryan Houdek
1b76655312
Missed a few asset copies
2013-04-23 14:27:50 -05:00
Ryan Houdek
bd72e13dd4
Generally make the Android UI better.
2013-04-23 14:27:49 -05:00
Ryan Houdek
f28efc24eb
Have our EGL interface use our logging functions.
2013-04-23 14:27:49 -05:00
Glenn Rice
9a50d055a1
Add Swedish translations.
2013-04-23 06:44:33 -05:00
Lioncash
e3e818f83c
Fix parameter naming in DSPEmulator.h. Should be "HLE" in CreateDSPEmulator's prototype, not "LLE".
2013-04-23 07:21:48 -04:00
Pierre
9a8dd7963e
Merge branch 'dspjit'
...
Conflicts:
Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
2013-04-21 12:29:18 +02:00
Ryan Houdek
9720d6b418
Allow runtime setting of fastmem in ARM and disable since it seems to be causing issues again. Cortex-A9 only?
2013-04-20 17:36:49 +00:00
Ryan Houdek
05eda7b0c1
Fix a build issue with options -DUSE_EGL=True -DUSE_GLES=True
2013-04-20 17:19:22 +00:00
Ryan Houdek
0973d503ef
Fix making the config directory so copying over assets won't fail.
2013-04-20 12:11:58 -05:00
Ryan Houdek
b47915d1e4
Enforce landscape view since rotations cause huge issues atm.
2013-04-19 09:44:38 -05:00
lioncash
d244bca1f5
Fix a bunch of random typos in comments and logging.
...
Also update the comment headers for two functions in GCMemcard.cpp.
2013-04-19 09:21:45 -04:00
Ryan Houdek
47f1505499
Add a fastmem option for enabling and disabling fastmem at runtime.
2013-04-19 07:50:33 -05:00
Ryan Houdek
bf5a046b82
Update the ant files to build the APK from terminal
2013-04-18 23:26:00 -05:00
Ryan Houdek
b429cb86aa
Update AndroidManifest to v0.2
2013-04-18 22:53:13 -05:00
Ryan Houdek
491ffabb56
Android Clang doesn't support TLS, so do the same thing as OSX.
2013-04-18 22:52:53 -05:00
Ryan Houdek
f811d11863
Fix clang building the std headers.
2013-04-18 22:52:05 -05:00
Ryan Houdek
d68955c539
Clang uses __clear_cache instead of __builtin___clear_cache like GCC
2013-04-18 22:50:58 -05:00
Ryan Houdek
d524781657
Adjust some files being built or not to fix clang on Android.
2013-04-18 22:50:03 -05:00
skidau
3a6492d3a9
Tweaked the aram dma exception timing to fix the hang that occurred in Viewtiful Joe.
2013-04-18 23:11:18 +10:00
Lioncash
e2ae73ba39
Lastly - new license header introduced to main Dolphin project. All done now.
2013-04-17 23:43:35 -04:00
Lioncash
e78d99e5c1
New license header introduced to all Video based projects.
2013-04-17 23:29:41 -04:00
Lioncash
bab9963b00
New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects.
2013-04-17 23:09:55 -04:00
Lioncash
ec10622425
New license header introduced to the Core project.
...
Also, remove DolLoader.h, it doesn't have any use. Boot_DOL.cpp/.h supercedes it.
2013-04-17 22:43:11 -04:00
John Chadwick
1e6dacf1e4
Make dolphin aware of disc revision numbers. Display them under game properties and use them in netplay.
...
Patch by johnwchadwick.
Fixed issue 6243.
2013-04-16 22:39:05 -05:00
Lioncash
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
skidau
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
skidau
71828e02f7
Renamed the VBeam variable for clarity.
2013-04-16 21:18:53 +10:00
lioncash
8bb845e646
Buildfix for the last commit.
2013-04-15 16:40:48 -04:00
lioncash
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
skidau
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
Lioncash
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
Ryan Houdek
7772f0d071
Merge branch 'Android-trash' since it is no longer quite so trashy.
2013-04-14 23:36:00 -05:00
Ryan Houdek
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
Lioncash
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
Ryan Houdek
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
Ryan Houdek
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
Pierre
7768b6f960
DSPJIT: Fix movToHostReg usage
2013-04-14 13:34:29 +02:00
Pierre
9299026572
DSP: fix for interpreter, jit ADDP
...
should probably use carry, not carry2
2013-04-14 13:34:29 +02:00
Pierre
5cbe75b389
DSPJIT: fix increase/decrease_addr_reg to match interpreter again
2013-04-14 13:34:29 +02:00
Pierre
d3de29c673
DSPJit: fix bug in DSPJitRegCache::getXReg
2013-04-14 13:34:29 +02:00
Pierre
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
Pierre
701b5916ab
Revert "In memory of calc84."
...
This reverts commit 539bf405f2
.
2013-04-14 13:34:29 +02:00
Pierre
9c1d18a14c
DSP/Jit: Some small optimizations to lsrn emitter
2013-04-14 13:34:29 +02:00
Pierre
6873443a9a
DSPJIT: RegCache: Fix writing immediates to guest registers
2013-04-14 13:34:29 +02:00
Pierre
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
Pierre
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
Pierre
54f3828555
DSPLLE: Move a bunch of helper functions from DSPJitMisc.cpp to DSPJitUtil.cpp
2013-04-14 12:05:03 +02:00
Lioncash
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
Lioncash
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
Ryan Houdek
24347e5176
Get latest android cmake to support NDK 8e
2013-04-13 15:09:05 -05:00
Ryan Houdek
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
Ryan Houdek
48927c17d2
Good job Windows. Stop choosing the same names as I do.
2013-04-13 00:54:11 -05:00
Ryan Houdek
39a7096711
Extend our OSD class to support callbacks on init, onframe, and shutdown.
2013-04-13 00:48:53 -05:00
Ryan Houdek
ccf1cee203
Implement a few more store instructions on ARM
2013-04-13 05:02:27 +00:00
Ryan Houdek
62adcaf552
Fix fastmem on ARM
2013-04-12 20:19:42 +00:00
Ryan Houdek
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
parlane
2c722bb04f
GOOGLE CODE, STOP BEING CRAP please :(
2013-04-12 02:46:30 +00:00
parlane
71a1ae3a16
Make debug builds use unicode, not multibyte.
2013-04-12 02:44:48 +00:00
skidau
ef4d59a21e
Refactored the SystemTimers to allow for per-UCode timing. Fixes issue 6237.
2013-04-12 12:08:05 +10:00
degasus
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
degasus
7e630ba920
Merge branch 'primitive_restart'
2013-04-11 14:01:58 +02:00
degasus
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
NeoBrainX
7480f5dfd6
ShaderGenCommon: Clean up.
2013-04-10 14:55:46 +02:00
NeoBrainX
6af14bd4ce
DolphinWX: Fail less at explaining what framelimit is doing.
2013-04-10 12:52:13 +00:00
NeoBrainX
e7a5847c30
ShaderGen: Build fix.
2013-04-10 14:44:09 +02:00
NeoBrainX
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
degasus
26b428539a
small cleanup suggested by neobrain
2013-04-10 14:12:35 +02:00
NeoBrainX
154c533e76
VertexShaderGen: Fix a small GLSL regression in emboss mapping.
2013-04-10 11:44:49 +00:00
NeoBrainX
fab4f1d0a5
LightingShaderGen: Improve code flexibility.
2013-04-10 13:38:31 +02:00
degasus
b9ba82ec03
proper ogl primitive restart code
2013-04-10 12:58:52 +02:00
NeoBrainX
31d2cab8d3
Add ShaderGenCommon to vcproj file list.
2013-04-10 12:55:42 +02:00
NeoBrainX
ec08914905
Move Shader UID mismatch checking to VideoCommon.
2013-04-10 12:54:22 +02:00
degasus
1aa10b579a
fix triangle_fan size calculation
...
wasn't updated for the new primitive restart implementation
2013-04-10 12:45:44 +02:00
degasus
a6412f7bd4
render a triangle for a 3 vertice quad
...
fix issue 6214
2013-04-10 12:36:59 +02:00
NeoBrainX
ec5f596b31
VertexShaderGen: More per-pixel-lighting fixes.
2013-04-10 12:17:28 +02:00
Jordan Woyak
b30c5b0048
NetPlay: Updated the "Alert" text. Removed the "?" button as it was useless. Sorted the game lists. Made wider the player list.
2013-04-09 22:04:55 -05:00
Jordan Woyak
385d8e2b15
ChunkFile has allowed me to accidentally "Do" a non-POD for the last time!
2013-04-09 19:02:22 -05:00
Jordan Woyak
5c374b2718
Update iso file cache version.
2013-04-09 13:04:23 -05:00
Jordan Woyak
98d35e590e
Fixed split WBFS file size display. (probably)
...
Fixed issue 6222.
2013-04-09 12:58:56 -05:00
Jordan Woyak
018282c2b9
Track the real wiimote rumble state to drop outgoing rumble reports with no effect.
...
This eliminates constant streams of reports in various games that constantly send audio reports. (Just Dance 2, DKCR, etc.)
(Speaker data reports are converted to rumble reports when speaker data is disabled.)
2013-04-08 18:50:42 -05:00
degasus
b0108631f6
use templates for primitive restart
2013-04-08 19:39:43 +02:00
degasus
4dca133745
small cleanups
2013-04-08 17:58:23 +02:00
degasus
80b56ddd17
convert triangle_fan to triangle_strip
2013-04-08 17:22:16 +02:00
degasus
cf98ef8cf3
enable primitive restart on dx11
2013-04-08 16:34:47 +02:00
degasus
702198f39b
Merge branch 'master' into primitive_restart
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Plugins/Plugin_VideoDX9/Src/main.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2013-04-08 15:57:51 +02:00
degasus
4c40e70b8a
ogl: support glsl120
2013-04-08 14:50:58 +02:00
degasus
3897e1959e
ogl: one framebuffer per efb2tex texture
...
suggestion from nvidia/valve. let's see if it helps
2013-04-08 14:36:58 +02:00
Rachel Bryk
deece78e19
Seriously, someone kill me.
2013-04-08 03:11:45 -04:00
Rachel Bryk
48f3e962d6
Kill me now.
...
Fixes issue 6227.
2013-04-08 03:05:12 -04:00
Lioncash
3ed0a96367
Remove an extraneous comment indicator from DebuggerPanel.cpp in DolphinWX.
...
Was asked to remove it, so... yeah.
2013-04-08 01:47:51 -04:00
Lioncash
1db10b139c
Remove all tab/space mismatches from the DolphinWX project (at least 99%. I promise!)
...
Also fix up the dangling else's. Shit just looks incredibly ugly in terms of actual structure in the code.
I took the liberty of adding comments in FifoPlayerDlg.cpp, LogConfigWindow.cpp, LogWindow.cpp, and FrameAui.cpp to better explain some things.
If any comments are wrong, don't hesitate to complain.
2013-04-08 01:16:50 -04:00
NeoBrainX
5b2d9a7d9f
Rename the "Disable Dest. Alpha Pass" option to "Disable Destination Alpha" (GUI-only).
2013-04-07 21:41:25 +00:00
Lioncash
195336021f
Fix a few typos in the comments/logging in VideoDX9, VideoCommon, and VideoSoftware projects.
...
See Render.cpp, PixelShaderGen.cpp, and PixelShaderManager.cpp for most of the changes.
See VertexShaderManager.cpp for a logging typo fix.
See SWRenderer.cpp for a small typo fix for a message that gets swprintf'd in DrawDebugText.
See SWVertexLoader.cpp for a typo fix of an assert message.
Should slightly improve the readability of some of those files.
2013-04-07 17:11:29 -04:00
Jordan Woyak
42e97e462c
Look for wiimotes when "Continuous Scanning" is enabled even if a device using the MS stack is not found.
...
Fixed issue 6215.
2013-04-07 14:21:20 -05:00
Pierre Bourdon
0ca7ea6c3f
D3D11: Fix glitched polygon edges when MSAA is enabled (this time without breaking OpenGL)
2013-04-07 20:58:48 +02:00
John Chadwick
8ce0d43717
Allow enabling memory card writes for netplay clients, instead of just the server.
2013-04-07 13:04:44 -04:00
John Chadwick
c7abf7e8d2
Allow disabling memory card writes in netplay.
...
Fixes issue 6217.
2013-04-07 12:18:07 -04:00
NeoBrainX
5f32febcf3
Apply re07a91930df0 to the software renderer.
2013-04-07 16:54:22 +02:00
skidau
b76c7cf4f3
Bumped up the LLE period to 12600 as it seemed to be a bit more stable.
2013-04-07 21:44:44 +10:00
skidau
52053f5d95
Forced an exception check after an interrupt is generated by the DSP. Changed the timing back to 3ms/5ms periods, fixing the slowdown and garbled AX audio.
...
Fixed Accurate VBeam emulation when DSP HLE audio is being used.
2013-04-07 16:27:46 +10:00
Jordan Woyak
53368823cb
Merge branch 'real-wiimote-minor-fixes'
2013-04-06 16:57:55 -05:00
skidau
8a2109691a
Quick fix to get Zelda: Wind Waker booting again.
2013-04-07 07:18:28 +10:00
skidau
ecb4337209
Made the timing consistent between DSP HLE and DSP LLE. Fixes Lost Kingdoms II in DSP HLE mode.
2013-04-06 20:26:43 +11:00
Rachel Bryk
4d81e0739d
Use an enum for efb scale values.
2013-04-06 01:49:13 -04:00
Jordan Woyak
c32e2f33ac
Fix IORead return off-by-one error in Windows real wiimote code.
2013-04-05 21:45:35 -05:00
Jordan Woyak
3c8477df03
Real Wiimotes: Invalidate last data report when any non-data input reports comes in.
2013-04-05 21:10:36 -05:00
skidau
518e7a7635
Adjusted the ARAM DMA transfer size again. Fixes the audio in the Sonic Mega Collection games.
2013-04-06 11:52:00 +11:00
Rachel Bryk
ee163d1e49
Someone take my commit rights away.
2013-04-05 17:26:56 -04:00
Rachel Bryk
6a5a522bba
Hastily committing untested code without making sure i didn't miss anything first? I would never!
2013-04-05 17:20:34 -04:00
Rachel Bryk
e531970052
Round IR scale down to whole number if using 1.5x/2.5x IR, if game ini specifies -1 for EFBScale.
...
Fixes issue 6210.
2013-04-05 17:13:48 -04:00
degasus
3e8ba3f3e8
fix msaa detection
2013-04-05 07:08:32 +02:00
Jordan Woyak
ceebed9268
Apply changes to Windows real wiimote code as suggested by bughunter2.
...
Fixed issue 6071.
2013-04-04 21:46:00 -05:00
Jordan Woyak
f8e52bd83a
Eliminate some redundant constants.
2013-04-04 19:46:42 -05:00
Jordan Woyak
71f4bf25a7
Make FifoQueue take advantage of rvalue references to avoid std::vector copies.
2013-04-04 19:34:50 -05:00
Jordan Woyak
99da297951
Fix minor issue with real wiimote data report handling.
2013-04-04 19:34:00 -05:00
degasus
a2ebb2b324
ogl: remove "Missing Extension" from osd
...
I think it was the best place, but I can't see "this issue is because of ..." any more
2013-04-04 18:55:37 +02:00
Rodolfo Bogado
d032f3fd79
Fix for the hang after close caused by my previews perf queries commit.
...
Sorry for that.
fix issue 6205
2013-04-04 12:53:06 -03:00
degasus
e11f5630b1
OGL: use GLEW_ARB_debug_output in debug builds
...
should also be used in normal build, but as our ubo "workaround" throws too much errors, it's disabled atm
2013-04-04 17:37:16 +02:00
lioncash
a7c05dc922
Remove an unused variable in VideoConfig.cpp and SWVideoConfig.cpp
2013-04-04 09:32:28 -04:00
skidau
aaf6c3b753
Forced the exception check when the ARAM DMA transfer is between 32 and 320 blocks in size. Fixes Lost Kingdoms II.
2013-04-04 22:38:39 +11:00
Grant Paul
39965e894d
Add native fullscreen support for OS X.
2013-04-03 21:20:43 -07:00
Grant Paul
9f8841e960
Revert "D3D11: Fix glitched polygon edges when MSAA is enabled."
...
This reverts commit 61c327ba8b
.
2013-04-03 21:17:09 -07:00