mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for slave mode with multiple input devices

Browse Source
This commit is contained in:
Gregor Richards 2017-09-19 21:23:42 -04:00
parent e20024ead9
commit 73bd969ac9
2 changed files with 42 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
network/netplay/netplay_frontend.c
View File

@ -148,7 +148,9 @@ static bool get_self_input_state(netplay_t *netplay)
used_devices |= (1<<local_device); used_devices |= (1<<local_device);
istate = netplay_input_state_for(&ptr->real_input[devi], istate = netplay_input_state_for(&ptr->real_input[devi],
netplay->self_client_num, netplay_expected_input_size(netplay, 1 << devi), /* If we're a slave, we write our own input to MAX_CLIENTS to keep it separate */
(netplay->self_mode==NETPLAY_CONNECTION_SLAVE)?MAX_CLIENTS:netplay->self_client_num,
netplay_expected_input_size(netplay, 1 << devi),
true, false); true, false);
if (!istate) if (!istate)
continue; /* FIXME: More severe? */ continue; /* FIXME: More severe? */
@ -225,10 +227,13 @@ static bool get_self_input_state(netplay_t *netplay)
} }
} }
ptr->have_real[netplay->self_client_num] = true;
ptr->have_local = true; ptr->have_local = true;
netplay->read_ptr[netplay->self_client_num] = NEXT_PTR(netplay->self_ptr); if (netplay->self_mode == NETPLAY_CONNECTION_PLAYING)
netplay->read_frame_count[netplay->self_client_num] = netplay->self_frame_count + 1; {
ptr->have_real[netplay->self_client_num] = true;
netplay->read_ptr[netplay->self_client_num] = NEXT_PTR(netplay->self_ptr);
netplay->read_frame_count[netplay->self_client_num] = netplay->self_frame_count + 1;
}
/* And send this input to our peers */ /* And send this input to our peers */
for (i = 0; i < netplay->connections_size; i++) for (i = 0; i < netplay->connections_size; i++)

49
network/netplay/netplay_io.c
View File

@ -212,7 +212,7 @@ void netplay_delayed_state_change(netplay_t *netplay)
/* Send the specified input data */ /* Send the specified input data */
static bool send_input_frame(netplay_t *netplay, struct delta_frame *dframe, static bool send_input_frame(netplay_t *netplay, struct delta_frame *dframe,
struct netplay_connection *only, struct netplay_connection *except, struct netplay_connection *only, struct netplay_connection *except,
uint32_t client_num) uint32_t client_num, bool slave)
{ {
#define BUFSZ 16 /* FIXME: Arbitrary restriction */ #define BUFSZ 16 /* FIXME: Arbitrary restriction */
uint32_t buffer[BUFSZ], devices, device; uint32_t buffer[BUFSZ], devices, device;
@ -232,7 +232,7 @@ static bool send_input_frame(netplay_t *netplay, struct delta_frame *dframe,
if (!(devices & (1<<device))) if (!(devices & (1<<device)))
continue; continue;
istate = dframe->real_input[device]; istate = dframe->real_input[device];
while (istate && (!istate->used || istate->client_num != client_num)) while (istate && (!istate->used || istate->client_num != (slave?MAX_CLIENTS:client_num)))
istate = istate->next; istate = istate->next;
if (!istate) if (!istate)
continue; continue;
@ -308,7 +308,7 @@ bool netplay_send_cur_input(netplay_t *netplay,
{ {
if (dframe->have_real[from_client]) if (dframe->have_real[from_client])
{ {
if (!send_input_frame(netplay, dframe, connection, NULL, from_client)) if (!send_input_frame(netplay, dframe, connection, NULL, from_client, false))
return false; return false;
} }
} }
@ -326,11 +326,12 @@ bool netplay_send_cur_input(netplay_t *netplay,
} }
/* Send our own data */ /* Send our own data */
if (netplay->self_mode == NETPLAY_CONNECTION_PLAYING || if (netplay->self_mode == NETPLAY_CONNECTION_PLAYING
netplay->self_mode == NETPLAY_CONNECTION_SLAVE) || netplay->self_mode == NETPLAY_CONNECTION_SLAVE)
{ {
if (!send_input_frame(netplay, dframe, connection, NULL, if (!send_input_frame(netplay, dframe, connection, NULL,
netplay->self_client_num)) netplay->self_client_num,
netplay->self_mode == NETPLAY_CONNECTION_SLAVE))
return false; return false;
} }
@ -1039,7 +1040,9 @@ static bool netplay_get_cmd(netplay_t *netplay,
dsize = netplay_expected_input_size(netplay, 1 << device); dsize = netplay_expected_input_size(netplay, 1 << device);
istate = netplay_input_state_for(&dframe->real_input[device], istate = netplay_input_state_for(&dframe->real_input[device],
client_num, dsize, true, false); client_num, dsize,
false /* Must be false because of slave-mode clients */,
false);
if (!istate) if (!istate)
{ {
/* Catastrophe! */ /* Catastrophe! */
@ -1064,7 +1067,7 @@ static bool netplay_get_cmd(netplay_t *netplay,
{ {
/* Forward it on if it's past data */ /* Forward it on if it's past data */
if (dframe->frame <= netplay->self_frame_count) if (dframe->frame <= netplay->self_frame_count)
send_input_frame(netplay, dframe, NULL, connection, client_num); send_input_frame(netplay, dframe, NULL, connection, client_num, false);
} }
} }
@ -1288,8 +1291,11 @@ static bool netplay_get_cmd(netplay_t *netplay,
netplay->device_clients[device] |= (1<<client_num); netplay->device_clients[device] |= (1<<client_num);
netplay->self_devices = devices; netplay->self_devices = devices;
netplay->read_ptr[client_num] = netplay->server_ptr;
netplay->read_frame_count[client_num] = netplay->server_frame_count;
/* Fix up current frame info */ /* Fix up current frame info */
if (frame <= netplay->self_frame_count) if (!(mode & NETPLAY_CMD_MODE_BIT_SLAVE) && frame <= netplay->self_frame_count)
{ {
/* It wanted past frames, better send 'em! */ /* It wanted past frames, better send 'em! */
START(netplay->server_ptr); START(netplay->server_ptr);
@ -1309,7 +1315,7 @@ static bool netplay_get_cmd(netplay_t *netplay,
} }
dframe->have_local = true; dframe->have_local = true;
dframe->have_real[client_num] = true; dframe->have_real[client_num] = true;
send_input_frame(netplay, dframe, connection, NULL, client_num); send_input_frame(netplay, dframe, connection, NULL, client_num, false);
if (dframe->frame == netplay->self_frame_count) break; if (dframe->frame == netplay->self_frame_count) break;
NEXT(); NEXT();
} }
@ -1964,17 +1970,28 @@ void netplay_handle_slaves(netplay_t *netplay)
while (istate_in && istate_in->client_num != client_num) while (istate_in && istate_in->client_num != client_num)
istate_in = istate_in->next; istate_in = istate_in->next;
if (!istate_in) if (!istate_in)
continue; {
istate_out = netplay_input_state_for(&frame->real_input[device], /* Start with blank input */
client_num, istate_in->size, true, false); netplay_input_state_for(&frame->real_input[device],
memcpy(istate_out->data, istate_in->data, client_num,
istate_in->size * sizeof(uint32_t)); netplay_expected_input_size(netplay, 1 << device), true,
false);
}
else
{
/* Copy the previous input */
istate_out = netplay_input_state_for(&frame->real_input[device],
client_num, istate_in->size, true, false);
memcpy(istate_out->data, istate_in->data,
istate_in->size * sizeof(uint32_t));
}
} }
frame->have_real[client_num] = true; frame->have_real[client_num] = true;
} }
/* Send it along */ /* Send it along */
send_input_frame(netplay, frame, NULL, connection, client_num); send_input_frame(netplay, frame, NULL, NULL, client_num, false);
/* And mark it as "read" */ /* And mark it as "read" */
netplay->read_ptr[client_num] = NEXT_PTR(netplay->self_ptr); netplay->read_ptr[client_num] = NEXT_PTR(netplay->self_ptr);