Commit Graph

8728 Commits

Author SHA1 Message Date
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
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