65404e7475
Removed duplicate definition of ibuild within JitIL.h. Fixes JitIL from hanging on x64/x86.
2013-11-01 12:33:29 +11:00
82729fcc8f
Merge remote-tracking branch 'shuffle2/vc12'
...
Conflicts:
Source/Core/Common/Common.vcxproj
Source/Core/Common/Common.vcxproj.filters
2013-10-31 16:51:56 -04:00
4c7bbd96e4
Improve ChunkFile.h:
...
- Add support for std::set and std:pair.
- Switch from std::is_pod to std::is_trivially_copyable, to allow for
types that have constructors but trivial copy constructors. Easy,
except there are three different nonstandard versions of it required
on different platforms, in addition to the standard one.
2013-10-31 15:40:53 -04:00
0f061e4e7c
[Android] Do /not/ give users the benefit of the doubt that the device supports OpenGL ES 3 when we can't grab an OpenGL context. The only devices that fail to do so is PowerVR5 and we can't run with them anyway.
2013-10-31 07:30:18 -05:00
498d491942
Merge branch 'viewportCorrection'
2013-10-29 22:33:51 +01:00
35824aa4d5
ogl: ceil viewport, rounding isn't supported on vs and this is more like the old behavior
2013-10-29 21:42:40 +01:00
ab35503195
ogl: don't force depth+stencil for default framebuffer
2013-10-29 19:20:40 +01:00
92fdac412b
VideoCommon: drop UpdateViewportWithCorrection
...
It's only used once in BPFunction which itself is also only used once.
So the setter is moved to BPStructs like all other ones.
2013-10-29 18:55:50 +01:00
2118c1d3c3
VideoCommon: remove constants.depthparams[2+3] as they aren't used in the shader at all
2013-10-29 18:55:50 +01:00
f4a9deefa8
ogl: remove some unneeded includes
2013-10-29 18:55:50 +01:00
8e0f91f70e
d3d: use backend based UpdateViewport instead of VideoCommon one
2013-10-29 18:55:50 +01:00
acc0b3b21c
ogl: don't call SetViewportChanged from backend as it's not needed any more
2013-10-29 18:55:50 +01:00
3151d8709c
VideoCommon: move ViewportCorrection into VideoCommon
...
D3D doesn't allow bigger viewports than rendertargets. But flipper does, so the viewport will be clipped and the transformation matrix will be changed.
This was done in the D3D backend itself. This is now moved into VideoCommon. This don't reduce code, but in this way, VideoCommon doesn't depend on the backends.
2013-10-29 18:55:50 +01:00
0002236e3e
Merge branch 'viewport_float'
2013-10-29 18:33:56 +01:00
b253d60f04
VideoCommon: Drop D3D9 SSAA implementation
...
This isn't needed for both OGL+D3D11 as they support sample shading directly. So we
could use the common MSAA util shaders instead of writing custom ones.
2013-10-29 18:20:07 +01:00
f18c461fd6
[viewport-float] Fix OpenGL ES 3 build.
2013-10-29 17:10:02 +00:00
edf0511d4e
OGL: Use floating points for viewport parameters.
...
As told by neobain, ARB_viewport_array introduced float viewports.
They must be supported on OGL4.1+, but it's usually also implemented on 3.3 GPUs.
2013-10-29 15:29:06 +01:00
c8d7db9767
Fix FXAA shader for OpenGL ES 3.
2013-10-29 07:24:16 +00:00
58d42f43e3
[Android] Fix PCH build. Clean up DolphinWX cmake file a little bit. Modify our android cmake toolchain file to make the default build location not be source root, because that is stupid.
2013-10-28 19:59:03 -05:00
3c7613fc83
[Android] More cleanup. We don't need the preference to enable/disable the overlay in the video preferences anymore.
2013-10-28 16:36:26 -04:00
4e999fe0ee
[Android] General cleanup.
...
We no longer need the buttons in Assets, considering they are now resources (ie. drawables).
Also remove (now) junk code from VideoSettingsFragment.java. We handle the input overlay within the InputSettingsFragment.
Also add a TODO detailing what needs to be refactored when axis support is finally added.
2013-10-27 22:15:49 -04:00
d1834b3058
[Android] Overlay now works during emulation.
2013-10-27 22:08:41 -04:00
2e983071c5
Add git.bat to the options in make_scmrev.h.js because depot_tools uses it and I'm silly.
2013-10-27 19:51:55 -04:00
b97e2faa15
Fix Linux build issue.
2013-10-27 19:51:55 -04:00
cfa709a1c5
This introduces a FXAA post processing shader for our OpenGL backend. I would like to acredit mudlord for making this possible. He provided the code necessary for making this PP shader possible. Without it, this shader would have still not been done. So a major hats off for doing all the hard work mudlord.
2013-10-27 17:45:53 -05:00
8e73e8ae5f
Wipe all traces of OpenSSL's AES implementation. Use polarssl instead.
2013-10-27 18:27:07 +00:00
0791a9ef80
Add dxsdk_dir to vc++ paths via base.props. This means you no longer need the paths in a global property sheet. In fact if you have them in such a file, you should remove them as it will cause conflicts with the vs2013 build.
2013-10-27 00:48:53 -07:00
8dcd13cca7
[vc12] std::min/max requires <algorithm> header. It should be in pch, but just add it for the single file that needs it, for now.
2013-10-26 18:04:00 -07:00
ccd30024b3
Update to VS2013 and a slew of build-related updates. Notes:
...
* Currently there is no DEBUGFAST configuration. Defining DEBUGFAST as a preprocessor definition in Base.props (or a global header) enables it for now, pending a better method. This was done to make managing the build harder to screw up. However it may not even be an issue anymore with the new .props usage.
* D3DX11SaveTextureToFile usage is dropped and not replaced.
* If you have $(DXSDK_DIR) in your global property sheets (Microsoft.Cpp.$(PlatformName).user), you need to remove it. The build will error out with a message if it's configured incorrectly.
* If you are on Windows 8 or above, you no longer need the June 2010 DirectX SDK installed to build dolphin. If you are in this situation, it is still required if you want your built binaries to be able to use XAudio2 and XInput on previous Windows versions.
* GLew updated to 1.10.0
* compiler switches added: /volatile:iso, /d2Zi+
* LTCG available via msbuild property: DolphinRelease
* SDL updated to 2.0.0
* All Externals (excl. OpenAL and SDL) are built from source.
* Now uses STL version of std::{mutex,condition_variable,thread}
* Now uses Build as root directory for *all* intermediate files
* Binary directory is populated as post-build msbuild action
* .gitignore is simplified
* UnitTests project is no longer compiled
2013-10-26 17:55:38 -07:00
1eba4da21a
Revert "Fixes GCC 4.9 compilation. It now supplies its own _mm_shuffle_epi8 intrinsic."
...
This reverts commit b2c4901b3f
2013-10-26 19:21:00 -05:00
b2c4901b3f
Fixes GCC 4.9 compilation. It now supplies its own _mm_shuffle_epi8 intrinsic.
2013-10-26 19:05:31 -05:00
f82e1b9dc7
D3D: Use floating points for viewport parameters.
...
OpenGL 4.1 allows for a similar change thanks to ARB_viewport_array, but we don't make use of this, yet.
2013-10-26 12:40:37 +02:00
c24dfe559b
[Android] Change how the onTouchEvent native method works. Just pass in the correct Button ID and Action and it'll be pressed or not. Not actually rigged up to the Java code yet. Doesn't support anything with an Axis yet so no C stick, main stick, L and R triggers
2013-10-26 05:36:20 -05:00
c3e4aa1f35
[Android] Add the copyright header to some Java source files that were lacking them.
2013-10-26 01:06:00 -04:00
c78d5a9751
[Android] Improve an if statement check in InputConfigFragment.java. Also clarify it.
2013-10-26 00:59:53 -04:00
8d71a83ae5
[Android] Fix the super-mature string that was a placeholder for the title for the overlay configuration setting.
...
Also fix a NullPointerException possibility. Fixed it by giving the PreferenceScreen a title.
2013-10-26 00:55:07 -04:00
41f6f6adc9
Added memchecks when the MMU is enabled. Thanks to comex for the fix.
...
Fixes issue 6754.
2013-10-26 14:32:03 +11:00
77eb9ce725
[Android] Add the capability to dynamically enable and disable the input overlay during emulation.
2013-10-25 23:10:17 -04:00
d9be95ed9e
[Android] Fix alignment issues with the overlay config settings.
2013-10-25 21:29:06 -04:00
7c6caa388a
[Android] Prevent automatic alignments within the overlay configuration settings. Let the user do this on their own.
2013-10-25 21:14:11 -04:00
c1ed54832c
[Android] Maintain the chosen button layout when returning to the input overlay configuration menu.
...
- Also make the overlay configuration screen fullscreen for the app.
- Also force the overlay activity to be landscape, since this is the only orientation the EmulationActivity supports.
2013-10-25 21:05:42 -04:00
c8cf71c913
[Android] The emulation overlay now sets the button positions based upon the locations chosen in the input overlay configuration settings. Documented the hell out of how the initialization of the Drawables works inside InputOverlay.java.
...
Also made the use of InputOverlayItem.java obsolete. So this is now removed.
2013-10-25 20:34:38 -04:00
88c797a9c0
[Android] Slight cleanup for previous commit. Mostly UI adjustments.
...
Makes the buttons appear uniformly on the overlay config activity.
2013-10-25 17:39:23 -04:00
9f36081a8f
[Android] Implement a very basic version of the input overlay configuration screen.
...
Still a bit of a mess, but this will get cleaned up during finalizations.
2013-10-25 16:52:46 -04:00
005af7bd63
Fix build on Mavericks.
2013-10-24 16:39:46 -04:00
0eba84c09f
Gameini database update. Carmen Sandiego(gc), Ed, Edd n Eddy (gc), Ice Age 2 The Meltdown (gc), The Incredibles(gc), Jedi Knight II: Jedi Outcast(gc), Enter The Matrix (gc), X-Men Next Dimension(gc), Project Zero 4 (wii), Resident Evil Archives: Resident Evil Zero (wii), Shaun White Snowboarding: Road Trip(wii), GoldenEye007 (wii), Namco Museum 50th Anniversary (gc), Future Tactics (gc), The Grim Adventures of Billy & Mandy (gc), NASCAR 2005 (gc), NAMCO MUSEUM (gc), MVP Baseball 2005 (gc), BIONICLE (gc), TY the Tasmanian Tiger 2 (gc), Blast Works Build, Trade, Destroy (wii), The Croods Prehistoric Party (wii) and various Japanese games are added/updated.
...
Fixes issue 6751.
Fixes most ini files from issue 6726.
Thanks to nash67 for his help.
2013-10-24 23:19:17 +03:00
1267877e80
[Android] Documentation typo cleanups from the last commit.
...
Also cleaned up the Javadoc for the constructor of MotionAlertDialog.
2013-10-24 15:10:25 -04:00
079147ca07
[Android] Refactor InputConfigFragment a little bit in preparation for the implementation of the new input overlay.
...
This moves all of the dialog handling into the actual MotionAlertDialog class itself. This is something I should have done a long time ago.
Also moved the Gamecube input binding preferences into their own PreferenceScreen.
2013-10-24 14:55:10 -04:00
69a10869bb
Document FPSCR fields
2013-10-24 01:46:07 +02:00
8aef60f6ca
Allow frame limit to be set via game ini.
2013-10-23 13:45:03 -04:00
skidau