Commit Graph

9418 Commits

Author SHA1 Message Date
Ryan Houdek fbd0fba13a [Android] Fix preferences from crashing. OSD controls was supposed to be boolean. 2013-08-21 00:06:48 -05:00
Ryan Houdek 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
Lioncash 53df78d372 [Android] Missed a string for the Japanese translation. 2013-08-20 20:48:43 -04:00
Lioncash e52c2ac337 [Android] Migrate the "Draw Onscreen Controls" preference to the video settings. 2013-08-20 20:28:48 -04:00
Lioncash 9170c9b360 [Android] Remove unnecessary string messages from CPUSettingsFragment and VideoSettingsFragment. 2013-08-20 19:57:00 -04:00
Lioncash 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
Pierre Bourdon a3a4f21284 Remove some spurious endlines at the end of log messages 2013-08-21 00:19:50 +02:00
Ryan Houdek 0521b6aa69 [Android] Hopefully fix buildbot's ant build. 2013-08-20 15:41:11 -05:00
Lioncash 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
Lioncash 3fdfd75832 [Android] Add most of the Dolphin video/gfx settings to the settings menu. 2013-08-20 14:33:30 -04:00
degasus 642657d07c ogl: explain why pinned memory is disabled for index buffer 2013-08-20 19:09:55 +02:00
degasus 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
degasus 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
degasus 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
Lioncash 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
Lioncash 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
Lioncash 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
Lioncash 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
Lioncash 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
Pierre Bourdon 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
Lioncash 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
degasus 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
Ryan Houdek 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
Ryan Houdek 8094037104 [ARM] Add ps_sum0 and a disabled ps_madd. 2013-08-19 18:13:08 +00:00
Ryan Houdek 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
degasus 23ce6b9227 ogl: remove glMapBuffer as it isn't in gles 2013-08-19 19:20:10 +02:00
Ryan Houdek 1675f56f02 [ARM] Disable faddsx since it causes problems in crazy taxi. 2013-08-19 12:26:25 +00:00
Ryan Houdek b4baa4fdb9 [ARM] Add mullwx, mulhwux and half implemented srawix instructions. Change fsubsx/fmulsx slightly, still broken. 2013-08-19 06:26:34 +00:00
Ryan Houdek 9bded1382c [ARM] Add ASR/ASRS and UMULLS emitters. 2013-08-19 06:26:34 +00:00
Jasper St. Pierre 7a41acd8ff NetPlayServer: Remove unused code
GetPlayerList is always called on the client.
2013-08-18 21:38:32 -04:00
Pierre Bourdon 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
Lioncash 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
Ryan Houdek 9f4ca0e0a7 [ARM] JitASM miroops. No functionality change. 2013-08-18 17:45:04 +00:00
Jasper St. Pierre 5782530b40 NetPlayProto: bump netplay version
Since the packet structure changed.
2013-08-18 09:10:15 -04:00
Justin Chadwick 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
skidau c774fb4880 Removed a redundant tooltip text. 2013-08-18 17:09:01 +10:00
skidau 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
Lioncash 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
Ryan Houdek ba76b016da [Android] Fix Wii games. 2013-08-17 19:41:28 -05:00
Ryan Houdek 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
Pierre Bourdon 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
Lioncash 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
Lioncash 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
Lioncash 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
Lioncash 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
Lioncash 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
Lioncash 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
Jasper St. Pierre 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
Ryan Houdek 7934df3879 Remove a redundant check in the fifo. 2013-08-17 01:27:08 +00:00
Matthew Parlane d0d162e6ad Fix really stupid optimise on Windows.
Possibly explains speed difference from master.
2013-08-17 12:16:51 +12:00
Ryan Houdek 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
Ryan Houdek 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
NeoBrainX 1ba98550ef VideoConfigDialog: Rephrase "Hacked Buffer Upload" and its description to something less technical. 2013-08-16 14:26:50 +00:00
Rachel Bryk 89d324786a Prevent stopping emulation before fully booting. This can sometimes cause dolphin to crash. 2013-08-16 10:04:08 -04:00
Ryan Houdek 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
Ryan Houdek 367f294ed2 [Android] Make sure to unallocate the correct memory size in MemArena. 2013-08-16 04:55:43 -05:00
Matthew Parlane 59e060aba2 Missed some VS build options. 2013-08-16 21:42:31 +12:00
Matthew Parlane 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
Lioncash 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
Pierre Bourdon 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
Rodolfo Bogado 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
Rodolfo Bogado 08a6b8920b re indentation to follow emulators code rules in some files I'm modifying 2013-08-15 15:16:32 -03:00
Ryan Houdek 10f6117905 Add some ifdef magic to GLFunctions.cpp to make it not directly dependant on GLESv3. 2013-08-15 18:15:55 +00:00
Rodolfo Bogado 8e9bbdeb2f some fixes for point rendering 2013-08-15 15:14:48 -03:00
Ryan Houdek 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
Rodolfo Bogado a5e34dd5cb merge changes from other back ends to the PerfQuery functionality 2013-08-15 14:45:18 -03:00
Rodolfo Bogado ba6a67a5f1 Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-15 13:49:53 -03:00
Jasper St. Pierre 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
Jasper St. Pierre 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
Matthew Parlane 417552b21e Not sure what that was. 2013-08-16 01:06:44 +12:00
Pierre Bourdon c6d8d52041 Fix a warning introduced by the recent netplay UI changes 2013-08-15 15:05:20 +02:00
Matthew Parlane d6ec6ae97a Fix polarssl on Windows. 2013-08-16 00:24:10 +12:00
Jack Frost d16f089e88 properly clean up PerfQuery on OGL 2013-08-15 13:52:31 +02:00
Matthew Parlane 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
Matthew Parlane b93d62dcb8 Remove LTCG and platform toolset, fix code style. 2013-08-15 21:43:43 +12:00
Matthew Parlane fede38985e Replace OpenSSL with PolarSSL
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
Rodolfo Bogado 979718484f Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-15 00:21:28 -03:00
Lioncash 072fac4a74 [Android] Remove a redundant LinearLayout in one of the layout files. 2013-08-14 20:49:26 -04:00
Lioncash 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
Jasper St. Pierre 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
Lioncash 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
Jasper St. Pierre 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
Pierre Bourdon 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
Jasper St. Pierre 998194246c NetPlay: Disable the "Start" button while the game is running 2013-08-14 18:16:07 -04:00
Jasper St. Pierre 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
Jasper St. Pierre 5241deaebe NetPlay: Allow hosts to stop the game by closing the game window 2013-08-14 18:16:05 -04:00
Jasper St. Pierre 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
Jasper St. Pierre 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
Pierre Bourdon 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
Pierre Bourdon 26f58e1ba5 Add an option to enable performance queries in gameini files, disable it by default 2013-08-14 23:16:46 +02:00
Pierre Bourdon ffdd79df36 Move VideoBackendBase from Common to VideoCommon 2013-08-14 23:16:46 +02:00
Lioncash 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
Lioncash 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
NeoBrainX 0cd94b5bc7 VertexShaderGen: Cleanup. 2013-08-14 11:47:23 +00:00
Lioncash 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
Lioncash 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
Rodolfo Bogado 0ec92f986b small correction, we cannot use dual source blending if separate alpha function is not supported 2013-08-13 17:31:50 -03:00
Rodolfo Bogado 85f91d66ba Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix 2013-08-13 17:30:22 -03:00
John Chadwick a791733c27 Fix invalid C++ code (returning reference to local) - thanks devm33. 2013-08-13 14:47:32 -04:00
Lioncash 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