Pierre Bourdon
cf20ff48aa
Merge pull request #3480 from phire/memory_stride_too_small
...
Avoid the "Memory stride too small" assert
2016-01-30 13:11:07 +01:00
Pierre Bourdon
9da8593cf4
Merge pull request #3569 from mathieui/netplay-gcpad-position
...
[netplay] Fix a regression
2016-01-30 11:54:31 +01:00
Pierre Bourdon
ff5d6887d1
Merge pull request #3575 from mathieui/netplay-server-cleanup
...
Small netplay server cleanup & fix
2016-01-30 11:51:50 +01:00
Ryan Houdek
f1ca95eec7
Merge pull request #3553 from Sonicadvance1/more_android_gc_adapter
...
Implement requesting permission for using the GC Wii U Adapter.
2016-01-29 23:12:37 -05:00
Ryan Houdek
5edc7705fe
Merge pull request #3550 from Sonicadvance1/egl_support_core_profile
...
Support the OpenGL core profile in EGL.
2016-01-29 19:37:24 -05:00
Ryan Houdek
c50efb17e5
Merge pull request #3546 from Sonicadvance1/egl_shared_context
...
Implement shared contexts in the EGL context.
2016-01-29 19:33:52 -05:00
Ryan Houdek
ea3a457091
Merge pull request #3573 from degasus/fifoplayer
...
Fifoplayer: Fix dual core
2016-01-29 16:39:32 -05:00
Ryan Houdek
e086928806
Merge pull request #3579 from Sonicadvance1/GLExtesions_gl_4_2
...
Implement support for GL 4.2 in GLExtensions
2016-01-28 19:25:17 -05:00
Ryan Houdek
88c232aa1b
Merge pull request #3580 from Tilka/fix_warnings
...
Fix warnings
2016-01-28 19:12:22 -05:00
Tillmann Karras
bf643c98aa
Fix warnings
2016-01-28 23:54:11 +00:00
Ryan Houdek
e1f21602fd
Merge pull request #3426 from Sonicadvance1/ES_fix_framedump
...
Add support for framedumping to OpenGL ES.
2016-01-28 18:24:32 -05:00
mathieui
c7750b287d
netplay: default the local pad to a gc controller
...
if the configured local pad is none, it will make dolphin behave
incorrectly (due to the game expecting inputs from the device while it
doesn’t exist).
2016-01-28 20:24:18 +01:00
mathieui
4529930f91
gcadapter: fix an incorrect mapping for non-local devices
...
Remote devices would always enter an error path and get disconnected
from the gamecube, breaking netplay in the process.
Culprit is still InGamePadToLocalPad
2016-01-28 02:46:58 +01:00
mathieui
b9b4a0c530
gcadapter: set the konga setting properly
...
if it was used in netplay, it would read memory out of bounds
(due to the mapping method returning 4 if the device was remote) which
was 0 more often than not, causing the device in this position to be a konga.
(which may or not be the gcadapter due to the swap between local and
ingame controllers)
2016-01-28 02:39:55 +01:00
Mathew Maidment
437b3db88e
Merge pull request #3514 from lioncash/mixer
...
Mixer: Minor changes
2016-01-27 19:19:42 -05:00
Ryan Houdek
b846ec084e
Implement requesting permission for using the GC Wii U Adapter.
2016-01-27 15:08:45 -06:00
Ryan Houdek
184a7a3e0d
Include the EGL defines we need for KHR_create_context ourselves.
...
This is because Google decided it was in their best interest to update eglext.h for android-21/arch-arm only and completely neglect all the other
architectures.
Sucks to suck.
2016-01-27 14:54:44 -06:00
Ryan Houdek
34d0e7835b
Support the OpenGL core profile in EGL.
...
This should make our Mesa EGL users happy.
2016-01-27 14:54:32 -06:00
Ryan Houdek
921c7139c5
Implement support for GL 4.2 in GLExtensions
2016-01-27 13:58:34 -06:00
Ryan Houdek
aed693eded
Implement shared contexts in the EGL context.
...
This is being implemented here first under EGL since the infrastructure is already in place for this due to the Android code requiring some bits.
The rest of the interfaces will come in a little bit.
This will be required for threaded shader compiling in the near future.
2016-01-27 13:15:02 -06:00
degasus
231daa2da1
Thread: Limit thread name to 15 bytes on linux.
2016-01-27 07:23:17 +01:00
degasus
a4a2928905
FifoPlayer: Sleep while high watermark is set.
2016-01-27 07:23:17 +01:00
mathieui
aaf2be2044
bootmanager: update the supposed-end-of-enum
...
fixes a bug where gcadapter would fuck up netplay
2016-01-27 01:43:38 +01:00
mathieui
24cb6487d4
[netplay] Fix a regression
...
Introduced in 6e13496d8
, pads would get assigned to their netplay
position, which breaks assumptions. With this behavior, the SI devices
should be mapped properly.
2016-01-27 01:43:31 +01:00
mathieui
8ce9191948
NetPlayServer: Make SendAsyncToClients use an unique_ptr
2016-01-27 01:34:03 +01:00
mathieui
34ae512d91
NetPlayServer: Make pad data unpacking nicer to read
2016-01-27 01:34:03 +01:00
mathieui
1c808a2835
NetPlayServer: Possible out-of-bounds access on invalid input
...
if a pad or wiimote number was outside bounds (e.g. 42353543232),
it would still have been read from the array, which could lead to
inappropriate consequences, like a segfault.
2016-01-27 01:33:50 +01:00
mathieui
8e1be37feb
NetPlayServer: in-class initialization
2016-01-27 01:20:44 +01:00
degasus
159d83c5a9
FifoPlayer: Use more enums.
2016-01-26 19:19:21 +01:00
Mathew Maidment
9199539798
Merge pull request #3568 from sigmabeta/android-settings-more-fixes
...
[Android] More settings fixes
2016-01-25 11:50:58 -05:00
sigmabeta
28bcd2636b
Fix CPU Core selection on x86-64 devices (really, just the Android emulator)
2016-01-25 09:28:57 -05:00
sigmabeta
96e7f774ae
Fix rotations in Settings screen breaking everything
2016-01-25 09:28:57 -05:00
Mathew Maidment
bdfcaa0e00
Merge pull request #3560 from lioncash/fifo
...
Fifo: get rid of global variables
2016-01-25 05:34:43 -05:00
Lioncash
488e7bd46a
Fifo: Get rid of undefined global
...
This declaration doesn't have a matching implementation
so it can be removed entirely.
2016-01-25 05:24:03 -05:00
Lioncash
32ce2be2bf
Fifo: Make g_use_deterministic_gpu_thread a TU-local variable
2016-01-25 05:24:03 -05:00
Lioncash
5ebd1e215b
Fifo: Make g_bSkipCurrentFrame a TU-local variable
...
This is only ever queried, making it a global isn't necessary.
2016-01-25 05:23:14 -05:00
Mathew Maidment
48e7e5b72e
Merge pull request #3567 from lioncash/netplay
...
NetPlayClient: Minor changes
2016-01-25 05:13:54 -05:00
Mathew Maidment
ee0fbdf087
Merge pull request #3558 from lioncash/dvd-global
...
DVDInterface: Reduce a global variable to translation unit scope
2016-01-25 05:13:08 -05:00
Lioncash
c434b5b3a9
NetPlayClient: Use std::array instead of C arrays for buffers
2016-01-25 04:57:21 -05:00
Lioncash
7304c863a6
NetPlayClient: Deduplicate code for player list retrieval
2016-01-25 04:57:20 -05:00
Lioncash
e6ad76fa70
NetPlayClient: Extract control mapping checking to its own function
2016-01-25 04:57:19 -05:00
Lioncash
8588c8fd31
NetPlayClient: Make SendAsync take a unique_ptr as a parameter
2016-01-25 04:57:18 -05:00
Lioncash
c2deb337aa
NetPlayClient: In-class initialize variables where possible
2016-01-25 04:57:17 -05:00
Lioncash
1d8ff504a5
NetPlayClient: Make m_state private
...
Also turns it into an enum class.
2016-01-25 04:57:16 -05:00
Lioncash
102672a797
NetPlayClient: Make is_connected private
...
This is only queried, there's no need to expose it for writing.
Even if it was written to, a data member shouldn't be part of
your public API unless its part of a dumb object or trivial struct.
2016-01-25 04:57:04 -05:00
Pierre Bourdon
0bd649248f
Merge pull request #3530 from degasus/syncgpufix
...
Fifo: Fix SyncGPU.
2016-01-25 10:46:08 +01:00
Pierre Bourdon
7b4e965465
Merge pull request #3555 from mathieui/gcadapter_payload
...
Fix a bug in GCAdapter
2016-01-25 10:42:28 +01:00
Lioncash
d9f87b8030
NetPlayClient: Remove unnecessary includes
...
Replace with needed ones
2016-01-24 21:46:49 -05:00
Mathew Maidment
c822afb2cb
Merge pull request #3566 from sigmabeta/android-settings-bugfix
...
[Android] Settings screen bugfixes
2016-01-24 19:38:56 -05:00
sigmabeta
fb04622039
Fix bugs in Setting screen & add a way to exit without saving
2016-01-24 19:31:34 -05:00