b34a5faee7
More cleaning.
2013-08-28 01:07:43 +12:00
2a68b65cda
Merge branch 'master' into wii-network
2013-08-28 00:57:37 +12:00
75c398118f
Fix headings and more.
2013-08-28 00:57:08 +12:00
d493525050
Add socket cleanup.
...
Don't know what to do with remaining sockops if called from a SetRegister reset command.
2013-08-28 00:37:45 +12:00
6748d5d087
Fix const.
2013-08-28 00:05:43 +12:00
eebcea9174
Fixed accept.
...
Added helper functions.
Removed unused structs.
2013-08-27 23:58:26 +12:00
4644a3bd16
Fix for Just Dance 4
...
Some clean ups.
2013-08-27 23:58:26 +12:00
40a1cb5dfe
ogl: warn on osd if not supported features are enabled
2013-08-27 13:24:23 +02:00
4a863c88b4
[Android] Simplify onAttach for CPUSettingsFragment and VideoSettingsFragment
2013-08-27 04:06:18 -04:00
76f20cca59
[Android] Remove the documentation of a parameter in GameListItem that was removed a while ago.
2013-08-27 04:01:20 -04:00
93f9f23576
ogl: reset api state for blitting
...
glBlitFramebuffer depends on scissior test and color mask. It isn't documented well,
but it does. So we have to reset the apistate before using it.
In this way, there isn't any benefit of glBlitFramebuffer, glDrawArray would be better :-(
2013-08-26 22:18:00 +02:00
15df7b3445
ogl driverdetails: add flag to disable hacked and pinned memory
...
pinned memory is broken for index buffers
hacked buffer crashes the amd driver
2013-08-26 19:45:19 +02:00
d83dffe442
[Android] Add wad file support.
2013-08-26 12:19:47 -05:00
670b028492
[Android] Remove the explicit key event listener from InputConfigFragment. The AlertDialog class has a key listener built into it.
...
Also documented the methods/interfaces in MotionAlertDialog.
2013-08-26 13:19:06 -04:00
e12c66b6cf
[Android] Only dismiss the input dialog when an input is registered. Before it would dismiss upon the first event. Fixes a bug where control sticks wouldn't register because of the AlertDialog closing immediately after the "if (firstEvent)" branch.
2013-08-26 12:56:35 -04:00
ba274368f8
[Android] Make the dialog variable in InputConfigFragment a local variable in onPreferenceTreeClick. With the new input UI, this doesn't need to be accessible to other classes.
...
Also change the documentation of the custom dialog class.
2013-08-26 11:58:51 -04:00
e051935659
Merge branch 'android-new-input-ui'
2013-08-26 09:15:50 -04:00
8006c878f8
Maybe libusb_exit fails when not initialized.
2013-08-27 00:58:20 +12:00
08153387c5
[Android] Greatly simplify the input handling for the button mapping settings. Now input handling is directly in the fragment.
2013-08-26 08:57:52 -04:00
aa7319e043
Slightly better error handling for libusb_init not working.
2013-08-27 00:46:04 +12:00
33761c0b65
More cleaning.
2013-08-27 00:22:44 +12:00
07ea771012
[Android] Finish documenting the native functions in NativeLibrary.java.
2013-08-26 08:06:28 -04:00
69bb04f79f
Fixed inconsistent usage of sock and used fd instead.
2013-08-26 23:57:18 +12:00
e8cde8464e
Code style fix and cleanup.
2013-08-26 23:24:41 +12:00
5ecd86708b
Disable Wii Sockets for NetPlay and TAS
2013-08-26 23:24:01 +12:00
db355b21d2
[Android] My bad, somehow the Java file in the previous commit got encoded with UTF8+BOM.
2013-08-25 23:57:53 -04:00
9dfb6dfd7f
[Android] Fixed a typo in the event callback system documentation.
2013-08-25 23:49:51 -04:00
786f09b1fa
[Android] Document the event callback system used in the Settings menu in large detail.
2013-08-25 23:47:51 -04:00
15f8603d1f
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Common/Src/FileUtil.cpp
2013-08-26 00:50:57 +00:00
0e8f9d8abc
Fix a crash in the Wiimote registration code
...
The code was hitting undefined behavior, causing crashes when starting a Wii
game with Dolphin compiled with gcc >= 4.8.
Might introduce some slight change in the Wiimote activation logic.
Fixes issue 6526.
2013-08-25 21:30:43 +02:00
28008814a7
[Android] Apparently I also forgot to commit the input menu layout.
2013-08-25 03:16:05 -04:00
6c0c460320
[Android] Woops forgot to commit the new resource strings.
2013-08-25 03:13:00 -04:00
709ab1feb5
[Android] Initial implementation of the new input UI.
...
Testing may be further required. But it should work for the most part.
2013-08-25 03:10:32 -04:00
18749bad68
Actually allow the dump and logs folders to be set outside of user/
2013-08-25 01:35:32 -04:00
8882f89bbc
Allow user folder to be set via command line.
...
Clean up GetUserPath(), to allow setting any path with it.
2013-08-24 23:15:55 -04:00
417bfb2630
Send pad buffer to clients when they join; fixes issue 6524.
2013-08-24 21:43:33 -04:00
72e0423f8b
Fix debug builds. Sorry.
2013-08-25 13:39:30 +12:00
74b61c7553
Dolphin depend on polarssl... :\
2013-08-25 13:27:20 +12:00
0dd98d62fc
Remove 'pragma optimize' in fakepoll.h - if optimizations cause breakage the breakage should be fixed instead of disabling opts
2013-08-25 03:04:43 +02:00
c4dec3fb3a
Remove debug verify cert code.
2013-08-25 13:02:34 +12:00
73be79f4e0
Fix trailing whitespaces in all files where some were added
2013-08-25 02:49:58 +02:00
987f4945b5
Fix indentation issues
2013-08-25 02:41:02 +02:00
1cbc8f8182
sync gpu: check disable flag before volatile
...
This could be an optimizing as this condition could be moved out of the loop.
So we save an atomic load.
But I don't know if it matters at all
2013-08-24 18:43:07 +02:00
2017ab9323
Revert "[Android] First french translation.
"
...
This reverts commit d2481aa477
2013-08-24 09:50:02 -04:00
31ea87d705
Revert "[Android] Added 2nd file for French translation.
"
...
This breaks the Android UI. 'translatable="false"' is there for a reason."
This reverts commit 5d9700a303
2013-08-24 09:43:21 -04:00
5d9700a303
[Android] Added 2nd file for French translation.
...
(Sorry, I didn't find how to upload 2 files at the same time in Google Code)
2013-08-24 13:37:42 +00:00
d2481aa477
[Android] First french translation.
...
Can't try it as I don't have any Android device. Any feedback appreciated.
If misplaced, please fix it.
2013-08-24 13:36:18 +00:00
a90e82d2c0
[Android] Invalidate the options menu upon switching fragments. This hides the 'clear game list' option faster when switching fragment. Also fixes a rare bug where the option might not even redraw when returning to the game list.
2013-08-24 09:19:40 -04:00
528a733359
[Android] Don't create a new GCMPath entry in the Dolphin config if it another existing GCMPath entry already has the same directory path.
...
Also, fix a 'bug' with the clear all items function. Make sure we set GCMPathes to 0, so that GCMPath entries start adding at GCMPath0 again.
This change also allows me to remove the duplicate checking code from GameListFragment, since the items in the game list are loaded based on the GCMEntries in the Dolphin config.
2013-08-24 09:12:17 -04:00
857ce47de2
[Android] Add the license header to Java files that were missing it.
2013-08-24 08:23:23 -04:00
5548e77438
Merge branch 'master' into wii-network
2013-08-24 23:56:31 +12:00
6907a32653
Fix android, part 3 of 3. >:)
2013-08-24 23:49:50 +12:00
d1057b2c6c
Fix android part 2 of X.
2013-08-24 23:41:25 +12:00
66c50ebf19
[Android] Better description for the dual core option.
2013-08-24 07:37:28 -04:00
7de9bda35e
Fixes hid.
...
Fix small bug in ssl when testing certain demos.
2013-08-24 23:16:58 +12:00
dbcc677922
Merge remote-tracking branch 'remotes/origin/dx9-ssaa-fix'
2013-08-23 22:43:03 -03:00
40243a4fe7
Indentation Fix
2013-08-23 22:28:17 -03:00
dfb34ddef4
NetPlayWindow: Make the spacing consistent on both sides
2013-08-23 20:40:34 -04:00
9303b57db1
Refactor VideoCommon/OnScreenDisplay.
...
Use strings internally, use a multimap and std::function for callbacks (instead
of a flat vector + loop over the vector to find the right callback type), fix
coding style issues. Simplify MainAndroid code a bit.
2013-08-24 02:13:54 +02:00
9deb63a312
Simplify a few OSD::AddMessage calls now that this function accepts std::string objects
2013-08-24 01:44:16 +02:00
367d6dfd65
Add an OSD message when taking screenshots in D3D9/D3D11
...
Fixes issue 6486.
2013-08-24 01:41:17 +02:00
6df36ec687
[Android] Forgot to commit the menu layout XML when I implemented the option to clear the game list.
2013-08-23 16:17:02 -04:00
7f61c31f85
[Android] Fix some redundancy in the category names for the settings menu. In a menu named "Settings" (which is shown in the top left) we have the categories, "CPU Settings" and "Video Settings" - but the fact they are settings pages is already established at this point so it's redundant. Just made them "CPU" and "Video" instead.
...
Also changed the description for dual-core
They now look like this: http://i.imgur.com/qieaKmL.png
2013-08-23 16:10:55 -04:00
c9e13f6b7a
ogl: fix ubo workaround
2013-08-23 17:53:20 +02:00
1469342f83
[Android] Add an option to clear the game list.
2013-08-23 11:17:24 -04:00
c2aef25f4c
[Android] Since we don't show invalid filetypes in the file browser anymore, there's no need to check if a file is valid or not since they're all valid now.
2013-08-23 10:26:15 -04:00
70dab0d839
[Android] Document most of the native functions in NativeLibrary.java.
2013-08-23 10:15:36 -04:00
654b0dbfa8
[Android] Fix the removal of duplicate items from the gamelist.
...
This should have initially been a nested loop since it now guarantees every item in the list is checked.
Also, removed some unused code and documented some things.
2013-08-23 09:50:00 -04:00
23ff31451f
NetPlay: Rework pad mapping
...
Pad mapping and the UI behind it is significantly confusing,
and has been confusing users since NetPlay was introduced.
As part of a large code cleanup to help NetPlay more stable,
introduce a better pad mapping system where local pad mapping
is handled by the client. Now, all the server and other
clients know is which player have which controllers, and the
clients only know this so they can show the pad mapping in the
UI; they don't do anything else with it.
A future cleanup will use this pad mapping data to completely
ignore the pads configured in the settings pane on the host.
2013-08-23 09:40:08 -04:00
7a5374258e
ogl: rework DriverDetails framework + detect UBO mesa bug
2013-08-23 10:52:29 +02:00
d9485cbf23
[Android] Only show valid files in the file browser.
2013-08-23 00:18:01 -04:00
1f3a0ff10b
Merge branch 'OpenAL-sane-defaults'
...
* OpenAL-sane-defaults:
Removed a redundant tooltip text.
Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs.
2013-08-23 12:15:39 +10:00
98a038aefb
Fix more *nix issues.
2013-08-23 00:58:12 +12:00
b6e054a2be
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/CoreParameter.cpp
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
2013-08-23 00:51:12 +12:00
41c25d0c90
[Android] General cleanup. Add more documentation.
...
Remove some accidental changes that slipped through. Don't want to have input settings in the settings menu just yet.
2013-08-22 08:18:56 -04:00
f274b3b074
Fix compile on *nix.
2013-08-23 00:13:26 +12:00
6acbea5c3e
Less verbose. Sorry.
2013-08-23 00:10:47 +12:00
124fe24f4c
Make wii-network async.
...
* accept still needs to be made async.
2013-08-22 23:58:56 +12:00
951bbcd6ce
[Android] Change the .settings file to target Java 1.6 instead of 1.5.
2013-08-22 07:39:11 -04:00
779f02d9a5
[Android] Turns out the sidebar XML could also be simplified.
2013-08-22 07:02:30 -04:00
0c5f3953dd
[Android] Simplify the XML layout for the about menu. Remove unused strings.
2013-08-22 06:58:19 -04:00
c2bab4edd4
[Android] Remove fragments from the Android Manifest XML. These shouldn't be defined here (nor do they need to. They're fragments, not activities).
2013-08-22 03:53:39 -04:00
7c99b0650b
[Android] Format all Java files to be consistent.
2013-08-22 03:43:07 -04:00
f09cafb2be
[Android] Make the previous commit parlane approved in terms of boolean conditions.
2013-08-22 02:57:31 -04:00
988c168c2d
[Android] Fix a bug in FolderBrowser.java which was causing an incomplete directory structure to show.
2013-08-22 02:52:05 -04:00
85c78759c7
[Android] Make two class variables in InputConfigFragment private. If left the way they were, they could be accessed by other classes in its package, which is not intended.
2013-08-21 21:27:32 -04:00
97bfa6300d
Remove unused code from InputConfigFragment. This was for when the option to draw onscreen controls was in this menu instead of video preferences.
2013-08-21 21:10:23 -04:00
20e82ec08c
Fix the fix to AVX support detection
...
Should be xgetbv(0) & 6 == 6, not just & 6. Thanks to tueidj for pointing this
out.
2013-08-22 01:08:14 +02:00
ca23318089
[Android] Fixed a bug where the config files might not load correctly upon launch. If the initial files existed, it wouldn't load the configs. This fixes that.
...
If the files don't exist they will be copied (in the previous block) and everything will be fine.
2013-08-21 16:02:43 -04:00
8b291b6b57
[Android] Allow users to be able to choose where they want the APK installed.
2013-08-21 14:35:31 -05:00
1eb1ba8c3d
Typo + Add Lima to the driverdetails.
2013-08-21 05:41:32 -05:00
1910f5851f
Make us capable of supporting driver specific issues(OSS versus official)
2013-08-21 05:34:52 -05:00
906cbe5ddf
ogl: enable glsl extension ARB_shader_image_load_store for early-z
2013-08-21 11:48:39 +02:00
60ccb2f44d
[Android] Fix Android 4.3 from crashing on my devices. This was annoying to find.
2013-08-21 00:12:53 -05:00
fbd0fba13a
[Android] Fix preferences from crashing. OSD controls was supposed to be boolean.
2013-08-21 00:06:48 -05:00
272dcb8756
In Windows, if BBA can't connect to any TUNTAP device then throw a panicalert, not just an error log.
2013-08-21 03:22:14 +00:00
53df78d372
[Android] Missed a string for the Japanese translation.
2013-08-20 20:48:43 -04:00
e52c2ac337
[Android] Migrate the "Draw Onscreen Controls" preference to the video settings.
2013-08-20 20:28:48 -04:00
9170c9b360
[Android] Remove unnecessary string messages from CPUSettingsFragment and VideoSettingsFragment.
2013-08-20 19:57:00 -04:00
00996c8d38
[Android] Implement a ViewPager for the settings. Also, move classes into appropriate packages to make things cleaner.
2013-08-20 19:39:00 -04:00
a3a4f21284
Remove some spurious endlines at the end of log messages
2013-08-21 00:19:50 +02:00
0521b6aa69
[Android] Hopefully fix buildbot's ant build.
2013-08-20 15:41:11 -05:00
8de3250550
[Android] Load all of the new settings from the ini when the app is launched.
...
- Also fix a typo in the ini saving method in UserPreferences. Accidentally spelt the ini name wrong.
- Also include the relocated XML preferences. I meant to push this with the previous commit.
2013-08-20 15:35:16 -04:00
3fdfd75832
[Android] Add most of the Dolphin video/gfx settings to the settings menu.
2013-08-20 14:33:30 -04:00
642657d07c
ogl: explain why pinned memory is disabled for index buffer
2013-08-20 19:09:55 +02:00
7b99fad274
ogl: fix the range of glDrawRangeElements
...
This range isn't the amound of rendered vertices (this is count).
It's the minimum/maximum of the indices in the index buffer.
2013-08-20 15:25:02 +02:00
64bd6a44d4
ogl: use texture_2d instead of renderbuffer for realxfb + efb2ram fbo
...
It should do the same on gpu, but textures are more flexible.
eg we could copy and sample them directly without blitting.
2013-08-20 15:11:03 +02:00
9dfb127923
ogl: remove glBindFragDataLocation
...
Without dual source blend, we have only one output per fragment shader,
so this is bound to zero by default.
2013-08-20 14:00:24 +02:00
dd35156717
[Android] Forgot to document the new parameter used in SaveConfigToDolphinIni() in the last change. Fixed that.
2013-08-19 22:37:04 -04:00
9595457e1c
[Android] Turn SaveConfigToDolphinIni() into a static method. Now saving settings to the ini config just uses one call in PrefsFragment.onDestroy().
2013-08-19 22:34:27 -04:00
6dbfdce775
[Android] Remove the loading toast messages from the UI. These really don't need to be here since the things they were used for took very, very little time to load.
2013-08-19 22:09:43 -04:00
8dc0b38f00
[Android] Decouple Dolphin.ini config file saving from GameListActivity. It doesn't make sense to save the config AFTER control is returned from PrefsFragment to GameListActivity, since the main purpose of PrefsFragment is to handle the user settings. So, instead, we call SaveConfigToDolphinIni() in the PrefsFragment.onDestroy() method. This way, when the PrefsFragment object is being 'destroyed', it will write the settings to the ini.
2013-08-19 21:56:13 -04:00
a87b967cde
[Android] Simplify saving settings to the ini file. Since the setting names are known, there's no reason to loop through them.
...
This will likely be simplified further very soon.
2013-08-19 20:55:50 -04:00
377202b9f6
Correctly check for AVX support in x64CPUDetect
...
It's not enough to check for the CPUID bit to know if AVX is supported since
AVX requires OS support (new set of registers == more registers to be saved
when context switching). If the OS does not support, the cpuid bit will still
be set but using YMM registers will cause an illegal exception fault.
2013-08-20 01:25:10 +02:00
77a5af3bcf
[Android] Change the settings menu a little more. Instead of the settings being a single view with settings from all components being displayed, I have broken it into sections. This future-proofs the settings menu in the sense that it won't get cluttered before people start asking "Hey, shouldn't this be broken into sections?".
...
As of this commit, it is broken into CPU Settings and Video Settings.
I also simplified the code that is responsible for setting the valid CPU cores and video backends by simply making UI string arrays that get chosen, based on the platform the Android device is running on.
2013-08-19 19:10:13 -04:00
814c1c9572
pixelShaderGen: also execute alpha test for always fail with late z test
...
This should fix issue 6493, but maybe no real issue as this rendering just do nothing
2013-08-19 21:27:54 +02:00
ba3d3311bd
[ARM] If one requests a FPR to not preload but then later ask it to preload. Make sure to preload it at that time. Would have caused issues with having to make sure the non-preloaded regs were always grabbed last.
2013-08-19 18:13:08 +00:00
8094037104
[ARM] Add ps_sum0 and a disabled ps_madd.
2013-08-19 18:13:08 +00:00
42de733c41
[ARM] Disable floating loadstores as they cause problems. Reenable faddsx/fsubsx as it works with loadstores disabled.
2013-08-19 18:13:08 +00:00
23ce6b9227
ogl: remove glMapBuffer as it isn't in gles
2013-08-19 19:20:10 +02:00
1675f56f02
[ARM] Disable faddsx since it causes problems in crazy taxi.
2013-08-19 12:26:25 +00:00
b4baa4fdb9
[ARM] Add mullwx, mulhwux and half implemented srawix instructions. Change fsubsx/fmulsx slightly, still broken.
2013-08-19 06:26:34 +00:00
9bded1382c
[ARM] Add ASR/ASRS and UMULLS emitters.
2013-08-19 06:26:34 +00:00
7a41acd8ff
NetPlayServer: Remove unused code
...
GetPlayerList is always called on the client.
2013-08-18 21:38:32 -04:00
5c3dcc50bc
Add an INI option to not loop FIFO playback and stop emulation when it's done
2013-08-19 01:39:00 +02:00
205ebbebbb
[Android] Catch a more specific exception type (UnsatisfiedLinkError) when trying to load the main native Dolphin 'library'.
...
Also made the logging tag more specific.
It's generally bad to catch Exception because it's not very specific for the person reading the code. It doesn't say why that exception might have happened, it just indicates it's possible for an Exception to happen, which is quite general.
2013-08-18 18:30:13 -04:00
c2d208df96
add the ability to export all save files
2013-08-18 15:02:40 -07:00
477c21e946
fix import/export of games with folders.
...
remove copy protection bit from banner
- should allow *some* copy protected games to be moved to a real system;
ex: super smash bros brawl, mario kart
games with a nocopy/nomove folder cannot be imported to a real system without using homebrew tools, warn for these saves
ex: guitar hero
remove some unneccessary class fields
the class is still incredibly ugly :(
2013-08-18 15:00:50 -07:00
9f4ca0e0a7
[ARM] JitASM miroops. No functionality change.
2013-08-18 17:45:04 +00:00
5782530b40
NetPlayProto: bump netplay version
...
Since the packet structure changed.
2013-08-18 09:10:15 -04:00
26242de914
Increases Gamecube pad polling rate during netplay to normal. Also re-add dualcore setting syncing to netplay, which I had erroneously removed.
2013-08-18 08:19:16 -04:00
c774fb4880
Removed a redundant tooltip text.
2013-08-18 17:09:01 +10:00
5cec914484
Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs.
2013-08-18 17:03:21 +10:00
803b7ae991
[Android] Make the banners display a little larger. Now they don't look like tiny icons in the game list.
2013-08-17 22:51:35 -04:00
ba76b016da
[Android] Fix Wii games.
2013-08-17 19:41:28 -05:00
7294fe5a3f
Change per instruction run counts to u64 on all platforms. JIT64 and JITIL runcount isn't implemented properly(and is disabled) so this doesn't effect them.
2013-08-18 00:15:47 +00:00
d6fe9c639b
Add an OSD message to remind the user if Shader Debugging is enabled
...
Fixes issue 6497.
2013-08-17 23:48:06 +02:00
07d729daa2
[Android] Prevent duplicate duplicate items from being in the game list at one time.
...
Previously it was possible for a game with the same path and name to be in the list as another. This is annoying because duplicates ae (obviously) no different from the initial item.
This prevents duplicates from entering the list.
The way this works is:
1. We get the final list of items to add to the list.
2. Loop through it using two indices, which, for this explanation I'll call [item] and [itemAfter]
We compare path name at item with index [item] and the path name at item with index [itemAfter]
To phrase this numerically comparison works like so:
for (int i = 0; i < listSize; i++)
{
if (i+1 < listSize)
item[i].getPath().equals(item[i+1].getPath())
}
3. For each path comparison that is true, remove item at [indexNext].
2013-08-17 14:28:50 -04:00
a9d634086c
[Android] Change the Game List items to be formatted similarly to how the folder browser is. Also ensure the 'no banner' icon scales down to the same size as the other banners.
2013-08-17 13:25:40 -04:00
1f6c63f1d8
[Android] Ensure that required dependencies are actually exported along with everything else when the Android version builds. Without this, the support libs will not export and cause the emulator to crash upon being executed.
2013-08-17 12:26:43 -04:00
88f79a14db
[Android] Simplify if statement conditions for the item click listener in FolderBrowser.java.
...
Since FolderBrowserItems have an 'isDirectory()' method, that's all we need to care about now. There's no need to check subtitles to determine if an item is a directory anymore.
2013-08-17 11:03:02 -04:00
9149b30237
[Android] Shorten FolderBrowserItem's method 'isValidItem()' into 'isValid()' makes more sense and less redundancy in terms of 'item.isValidItem()' -> 'item.isValid()'
2013-08-17 10:55:13 -04:00
5047eeb263
[Android] FolderBrowserItem objects don't need to store a context.
...
Removed the requirement to pass a context in the constructors.
Also cleaned out unnecessary imports.
2013-08-17 10:50:31 -04:00
756bf93111
NetWindow: Move "Write memcards" checkbox to be host-only
...
The setting is propagated from the host, so the client checkbox would
be ignored anyway.
2013-08-16 21:42:38 -04:00
7934df3879
Remove a redundant check in the fifo.
2013-08-17 01:27:08 +00:00
d0d162e6ad
Fix really stupid optimise on Windows.
...
Possibly explains speed difference from master.
2013-08-17 12:16:51 +12:00
08b27bb3b8
In the EGL backend context interface, don't call eglMakeCurrent. This was only done to pull in some information to the info log. This is necessary since eglMakeCurrent binds the context to the current thread and we need to destroy the context and reinitialize it when jumping to a new thread. We already call MakeCurrent in Video_Prepare which is done in the new thread.
2013-08-16 23:41:45 +00:00
49963da371
Put the shader info log at the end of the shader log file. This fixes issue 6495.
2013-08-16 21:05:35 +00:00
1ba98550ef
VideoConfigDialog: Rephrase "Hacked Buffer Upload" and its description to something less technical.
2013-08-16 14:26:50 +00:00
89d324786a
Prevent stopping emulation before fully booting. This can sometimes cause dolphin to crash.
2013-08-16 10:04:08 -04:00
da560ecefc
On CoreParemeter member object creation make sure to set bEnableDebugging, bAutomaticStart, and bBootToPause to default values so they aren't unitialized. This caused a issue in particular on the Android builds where bBootToPause would cause the games to boot in to a paused state, effectively causing the application to need to be forced closed and reran multiple times in order to test anything.
2013-08-16 07:30:53 -05:00
367f294ed2
[Android] Make sure to unallocate the correct memory size in MemArena.
2013-08-16 04:55:43 -05:00
59e060aba2
Missed some VS build options.
2013-08-16 21:42:31 +12:00
9de7611ff9
Merge branch 'master' into wii-network
...
Conflicts:
CMakeLists.txt
Source/Core/Core/Core.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj
Source/Core/DolphinWX/Dolphin.vcxproj.filters
Source/Dolphin_2010.sln
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-08-16 19:17:07 +12:00
82e9bed20e
[Android] Fix a bug where the name would display incorrectly in the game list.
...
Completely missed the 'this.' on the variable. My bad.
2013-08-15 20:34:05 -04:00
c3065ecb66
Fix compatibility with the SDL2.0 release.
...
SDL2.0 removed SDL_HAPTIC_SQUARE because of ABI issues (see comment #7 on issue
6491 by Ryan C. Gordon from the SDL project). It will be reintroduced again in
2.1, so keep the code and #ifdef it away.
2013-08-15 22:18:40 +02:00
1de39a4a6e
Revert wrong indentation of some files. sorry for that one i was really convinced that i read that spaces must be used instead of tabs :)
2013-08-15 15:40:57 -03:00
08a6b8920b
re indentation to follow emulators code rules in some files I'm modifying
2013-08-15 15:16:32 -03:00
10f6117905
Add some ifdef magic to GLFunctions.cpp to make it not directly dependant on GLESv3.
2013-08-15 18:15:55 +00:00
8e9bbdeb2f
some fixes for point rendering
2013-08-15 15:14:48 -03:00
06620ff364
[Android] Fall back to using dlsym on ourselves to pull in OpenGL Functions when eglGetProcAddress fails. This fixes an issue on the Chromebook where I was forced to link to libGLESv2 and pull in the functions statically since eglGetProcAddress wouldn't return any GLESv3 functions. This also changes glMapBuffer to glMapBufferOES because glMapBuffer isn't actually part of the OpenGL ES 3 spec...
2013-08-15 18:07:56 +00:00
a5e34dd5cb
merge changes from other back ends to the PerfQuery functionality
2013-08-15 14:45:18 -03:00
ba6a67a5f1
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-15 13:49:53 -03:00
863fb9f95b
D3DBase: Fall back to creating a normal context when debug fails
...
This can happen if the user does not have an up to date version of
the DirectX SDK, as Microsoft intentionally broke it and requires
users to install the W8 SDK.
2013-08-15 10:19:14 -04:00
605e3e8f65
Revert "D3DBase: Don't pass the DEBUG flag when creating a device"
...
This reverts commit 0e6b5bc5c8
2013-08-15 10:07:52 -04:00
417552b21e
Not sure what that was.
2013-08-16 01:06:44 +12:00
c6d8d52041
Fix a warning introduced by the recent netplay UI changes
2013-08-15 15:05:20 +02:00
d6ec6ae97a
Fix polarssl on Windows.
2013-08-16 00:24:10 +12:00
d16f089e88
properly clean up PerfQuery on OGL
2013-08-15 13:52:31 +02:00
d8b39b9dcf
Support PolarSSL on *nix
...
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
2013-08-15 23:36:17 +12:00
b93d62dcb8
Remove LTCG and platform toolset, fix code style.
2013-08-15 21:43:43 +12:00
fede38985e
Replace OpenSSL with PolarSSL
...
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
979718484f
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-15 00:21:28 -03:00
072fac4a74
[Android] Remove a redundant LinearLayout in one of the layout files.
2013-08-14 20:49:26 -04:00
3e6f9d22db
[Android] Add a faint divider line between each folder browser item.
...
See here for how it looks: http://i.imgur.com/CGX9NTt.png
2013-08-14 20:43:29 -04:00
3380e47ca7
MemArena: Free memory for 64-bit machines
...
Make the logic here a lot simpler. Patch contributed by Google Code
user plbl4ster.
2013-08-14 20:34:15 -04:00
9c27fedd6d
[Android] Remove the subtitles on all folders in the folder browser. No need to have the subtitle "Folder" when it's visibly indicated by the icon of a folder next to it.
...
Now it looks like this: http://i.imgur.com/CbUSqgg.png
2013-08-14 19:49:39 -04:00
1826fce946
NetPlay: Make sure the server knows it's stopped when it's stopped
...
This is embarassing.
2013-08-14 18:36:09 -04:00
7622d5b354
Only call SetGenerationMode from BPWritten if the cull mode changed.
...
Should decrease CPU usage on the GPU thread by a bit in the OGL backend.
2013-08-15 00:26:03 +02:00
998194246c
NetPlay: Disable the "Start" button while the game is running
2013-08-14 18:16:07 -04:00
1c74e412e2
NetPlay: Remove the "Stop" button
...
Now that the host can simply close the window, there's no need for this extra control.
2013-08-14 18:16:06 -04:00
5241deaebe
NetPlay: Allow hosts to stop the game by closing the game window
2013-08-14 18:16:05 -04:00
92f8d79574
NetPlay: Set the pad buffer size on server creation
...
If we don't do this, then when the game starts we'll send out the
buffer size to clients being a super large value of junk, and they'll
hang forever trying to accumulate an input buffer a size that they'll
never ever reach in a million years.
This never manifested in release builds for some reason.
2013-08-14 18:15:28 -04:00
0e6b5bc5c8
D3DBase: Don't pass the DEBUG flag when creating a device
...
In order for this flag to not fail, you either need a Windows 8 machine
or upgrade to the paid version of Visual Studio 2012. Not gonna happen.
2013-08-14 18:04:44 -04:00
e60e50a198
Respect ShouldEmulate() in PerfQuery implementations for DX11 and OGL (ugly implem, but the current state of VideoCommon does not allow much better)
2013-08-14 23:18:00 +02:00
26f58e1ba5
Add an option to enable performance queries in gameini files, disable it by default
2013-08-14 23:16:46 +02:00
ffdd79df36
Move VideoBackendBase from Common to VideoCommon
2013-08-14 23:16:46 +02:00
94397a44cc
[Android] General formatting clean-up.
...
Made some class variables final, since they should convey that they cannot be changed after the first assignment.
Made the formatting consistent between files.
2013-08-14 15:03:07 -04:00
6f1612d99c
[Android] Fix the gamepad settings view inflation.
...
In some cases, it would fail to inflate correctly in the sense that it would only show the binding status and not the name of the actual control that was being binded.
2013-08-14 14:33:47 -04:00
0cd94b5bc7
VertexShaderGen: Cleanup.
2013-08-14 11:47:23 +00:00
39eeb37032
[Android] Correct the accessibility scope of a method and variable in InputConfigFragment.java.
...
Also, join a variable's declaration and assignment in the onMotionEvent() function.
If no explicit accessibility term (private, protected, public, etc) is given, then the permission level is set to something called 'package-private' which means it is set to the scope of the whole package. So technically any class could have access to this method and variable, which is likely not what we want.
2013-08-14 07:33:17 -04:00
0142efbb2a
[Android] Add 'final' to all of the class declarations.
...
This prevents inheritance of the classes (will throw a compiler error if you try and extend any of the classes).
This is mainly syntactical sugar and form. Nothing major.
2013-08-14 07:17:45 -04:00
0ec92f986b
small correction, we cannot use dual source blending if separate alpha function is not supported
2013-08-13 17:31:50 -03:00
85f91d66ba
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-13 17:30:22 -03:00
a791733c27
Fix invalid C++ code (returning reference to local) - thanks devm33.
2013-08-13 14:47:32 -04:00
3cc8f7747e
[Android] Main title text for the file browser items are bolded again. Must have removed it accidentally during the previous large refactor.
2013-08-13 14:32:46 -04:00
53bf55b1e9
[Android] Make the file browser look much more nice and user friendly to use.
...
This is what it now looks like: http://i.imgur.com/KOZgA1i.png
As usual, if any bugs arise from this rather large change. Please report it so I can fix it.
2013-08-13 13:05:42 -04:00
8fbf11a0d9
[Android] Add translatable="false" to the names of the string arrays in prefvalues.xml.
2013-08-13 12:10:42 -04:00
a8fcd50cd7
[Android] Integer.toString isn't required in this string declaration. Concatenation handles this.
...
For example: "string" + 1 will just be concatenated as "string1" implicitly.
2013-08-13 10:09:42 -04:00
debd5b42cf
[Android] Clean up function SupportsGLES3 in PrefsFragment.java a little bit.
2013-08-13 09:48:18 -04:00
2015484c24
[Android] Some tiny cleanups in DolphinEmulator.java
...
- Join variable declaration and assignments in function onTouchEvent()
- Change a for-loop into a foreach loop in dispatchGenericMotionEvent(). Makes the loop body a single statement.
2013-08-13 09:23:11 -04:00
0916d0797c
Simplify asset copying code a little bit in DolphinEmulator.java
...
Since the directories are already cached (with smaller variable names), use these instead so we can shorten the length of each line.
2013-08-13 09:13:46 -04:00
e3617a55a0
[Android] Clean up the function CopyAsset in DolphinEmulator.java.
...
[streamtype].flush() is called when [streamtype].close() is called.
No need to null the references either after calling close(), the garbage collection will take care of it.
2013-08-13 08:58:50 -04:00
2d7244f6d5
[Android] Change the name of a variable in FolderBrowser.java to better reflect its purpose
...
Compressed file formats are not valid, so it's best to rename this to invalidExts.
2013-08-13 08:50:21 -04:00
b823983199
[Android] Multi-language support (or at least the basic foundation of it).
...
Added an example translation (Japanese). So now the Android version can both display in English and Japanese, depending on what the Android device's system language is set to.
Also did a tiny clean-up of InputConfigItem.java so that the parameters are slightly more descriptive.
Now, to do a translation in [x] language, all you have to do is take the normal English strings.xml and translate the XML entries into said language, and simply make a folder in the /res/ sub-directory in the form of values-[region code]. IE) With the Japanese translation, it is in the folder /res/values-ja
No configuration other than that is needed. After doing the above, the language should load fine on any device when set to that specific system language.
By default, if a translation file does not exist for a given system language. The app will automatically fall back to using the English translation.
This *should* be bug-free since I did check everything multiple times. But if any issues occur, please report them so that I can fix them.
2013-08-12 21:22:20 -04:00
9e0fc8b42d
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-12 21:32:25 -03:00
3b272d81b4
[Android] Use a HashMap in PrefsFragment.java instead of two CharSequence arrays.
...
This way, we hold the [key|value] pairs together in one object and reduce overall code clutter.
2013-08-12 19:41:23 -04:00
00b034f991
[Android] Seems like InputConfigFragment.java also had explicit list indexing. Removed it from here too.
2013-08-12 15:32:52 -04:00
68e12407a5
[Android] Remove unnecessary explicit indexing of entries in a List within AboutFragment.java
...
Indexes are handled internally within a List object.
2013-08-12 15:16:15 -04:00
057551ada7
Software Renderer: Show each backend's display name instead of its short name in the config dialog.
2013-08-12 18:30:42 +02:00
c05aa0141d
ShaderGen: Optimize out most function calls for uid generation.
2013-08-12 18:30:42 +02:00
fe2ca814c5
LightingShaderGen: Use macro magic instead of snprintf. Should fix performance problems.
2013-08-12 18:30:42 +02:00
22d9736787
ShaderGen: Static inline everything.
2013-08-12 18:30:42 +02:00
69a5a79c03
PixelShaderGen: Optimize shader uid data order.
2013-08-12 18:30:42 +02:00
7a1940020d
VertexShaderGen: Optimize shader uid data order.
2013-08-12 18:30:41 +02:00
5948665cd6
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-12 10:30:19 -03:00
d0084cb41d
Main: Fix code that creates the BIOS subdirectories
...
We need to ensure that the file path ends with DIR_SEP, as
File::CreateFullPath is a very naive function.
2013-08-12 06:23:58 -04:00
958590beaa
[Android] Fix OpenGL ES 3 detection on Nexus 10. Nexus 10 defaults to GLES1 context when not specified while Adreno defaults to GLES2. Thanks to Jeremy D Miller for noticing and finding out why this was failing.
2013-08-12 04:44:08 -05:00
4c22e1264e
PixelShaderGen: Do not write depth in pixel shader if depth testing (and thus writing) is not enabled. Should improve performance quite a bit in some cases.
...
Fixes issue 6474.
2013-08-12 09:33:36 +00:00
7f3c06de27
[ARM] Add a few instructions.
2013-08-12 02:52:56 +00:00
f4000b6b42
Add the ability to force Dual Source Blending in the configuration file.
...
this way everyone can check if their hardware support this feature in dx9
2013-08-11 18:48:31 -03:00
f217004499
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-11 18:44:45 -03:00
22b3c26654
Main: Create BIOS subdirs of GC userdir on load
...
So that users don't get confused about where to place the BIOS files
2013-08-11 14:33:26 -04:00
d0729983b0
Check for GC BIOS in userdir before sysdir
2013-08-11 14:13:45 -04:00
b5c2737c9f
IniFile: Don't parse comments after the [Section] brackets
...
This is non-standard behavior. We won't fail to parse, but we now
won't write them back out either.
2013-08-11 11:32:10 -04:00
0eaea5f4df
IniFile: Remove support for comments anywhere but the beginning of lines
...
The MS INI parser and most other INI parsing libraries APIs only support
comments at the beginning of lines. Right now, some Game INI files use sections
like:
[OnFrame]#Add memory patches here
But these section headers are parsed separately, so this should not break
them.
2013-08-11 11:30:52 -04:00
a1d8d8ce87
fix for 4x super sampling AA.
...
make the distance of the samples from the center smaller to minimize errors.
2013-08-11 12:26:20 -03:00
3066d8471e
Mark the Direct3D9 backend deprecated.
...
sadly one important functionality is impossible to implement correctly in this backend(zcomplock).
Still, I will try to fix as many issues as i can.
2013-08-11 11:55:13 -03:00
4ed8972c30
[ARM] Implement andx, andi_rc, and andis_rc.
2013-08-11 08:21:17 +00:00
42aef24d78
[ARM] IMM support for all integer instructions that call ComputeRC. Small FPS gains everywhere.
2013-08-11 07:41:23 +00:00
ef83d03dc0
[ARM] Fix ori again.
2013-08-11 05:07:20 +00:00
a279001472
Remove "-0" from stable version numbers in a more foolproof manner for vs and cmake builds.
2013-08-10 17:19:19 -05:00
951d8e356a
Remove some non-catastrophic IPC_HLE wiimote related PanicAlerts. We have logging for this.
...
Fixed issue 6464.
2013-08-10 16:50:12 -05:00
eed36cbf78
D3D11: Implement zcomploc for hardware supporting D3D 11.0.
2013-08-09 22:20:35 +02:00
805009abca
Fix a merge fail that happened when I merged in Android. It is just a bit of duplicate code, no issues came from it.
2013-08-09 19:01:27 +00:00
0aa9308006
Revert "Fix a memory leak in ExpressionParser.cpp"
...
This reverts commit cce809ac90
2013-08-09 10:46:11 +02:00
90d454d22f
Remove -0 from stable release version numbers.
2013-08-08 23:59:53 -04:00
9ea01aa7a8
Use a multibyte-neutral codepage when calling *printf on Windows.
...
More explanation in code comments.
Fixes issue 4046.
2013-08-09 00:17:48 +02:00
cce809ac90
Fix a memory leak in ExpressionParser.cpp
...
Because there's a return here, expr should be deleted since it's not assigned to anything before returning.
2013-08-08 17:56:15 -04:00
72abe7c654
Fix a stack corruption in ExtendedTrace.
...
Fixes issue 6454.
2013-08-08 20:29:20 +02:00
a6fd2c8227
fix lightning for inconsitent config
...
It's possible to configure to use the vertex color as lightning source without enabling the vertex color at all.
The old implementation will use zero, but it seems to be wrong (prooven by THPS3), more likely is to disable
the lightning and just return the global color.
This fixes THPS3 on OpenGL, but it isn't verifed on hardware
2013-08-07 14:22:15 +02:00
9d0554e4a6
Free two memory leaks in ArmCPUDetect.cpp
...
Char pointers aren't freed after use.
Fixed this in PPSSPP a few days ago. Forgot to check here for the same thing until now.
2013-08-06 18:17:54 -04:00
dc23a076be
disable emulate format changes on glsl120
...
The current shader uses bit operations which aren't supported by glsl120.
A workaround with round + frac + lots of additions would be possible, but unreadable.
So I think it isn't worth
But this fixes the annoying shader compilation error message
2013-08-06 10:34:30 +02:00
88212fba67
Add new Netplay headers to the VS project.
2013-08-05 23:15:53 -04:00
873987bc99
[ARM] Some initial support for immediates in integer. Plenty more to go.
2013-08-05 19:48:15 +00:00
4752eae677
[ARM] Fix IMM support in the register cache.
2013-08-05 18:33:51 +00:00
9f90cbee19
NetPlayServer: Close the socket when we're done with it
...
This would allow a new socket to be created with the same port after
we close it. However, we can't reuse it immediately because of the TCP
TIME-WAIT state.
2013-08-05 06:43:27 -04:00
59ab60f37f
NetPlay: Supply every player's ping data to the client
...
This means that we now have feature parity with the combined server
before.
2013-08-05 06:12:56 -04:00
a3a222bf5b
NetPlay: Remove NetPlay.h / NetPlay.cpp
...
Now the server and client implementations are entirely separate.
2013-08-05 05:05:06 -04:00
9e63cebc93
NetPlay: Remove the base NetPlay class
...
It's only used by the NetPlayClient. For now, keep around NetPlay.cpp,
but we'll remove that soon.
2013-08-05 04:56:30 -04:00
Matthew Parlane
