From b7f0e886d99af77fb3e1a32a97b110800aaf60e1 Mon Sep 17 00:00:00 2001 From: weihuoya Date: Tue, 22 Jun 2021 15:15:33 +0800 Subject: [PATCH 1/3] make sure initialized, prevent garbage data --- src/video_core/renderer_opengl/gl_shader_gen.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/video_core/renderer_opengl/gl_shader_gen.cpp b/src/video_core/renderer_opengl/gl_shader_gen.cpp index ee4cea9f2..6c46609cb 100644 --- a/src/video_core/renderer_opengl/gl_shader_gen.cpp +++ b/src/video_core/renderer_opengl/gl_shader_gen.cpp @@ -111,7 +111,7 @@ out gl_PerVertex { } PicaFSConfig PicaFSConfig::BuildFromRegs(const Pica::Regs& regs) { - PicaFSConfig res; + PicaFSConfig res{}; auto& state = res.state; From adac0d193bcc3fcf4d560b2763d947d6c18af0fb Mon Sep 17 00:00:00 2001 From: weihuoya Date: Sun, 4 Jul 2021 23:06:13 +0800 Subject: [PATCH 2/3] reduce network latency --- src/network/room.cpp | 2 +- src/network/room_member.cpp | 18 ++++++++++-------- 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/network/room.cpp b/src/network/room.cpp index cd0c0ebc4..2dc69c112 100644 --- a/src/network/room.cpp +++ b/src/network/room.cpp @@ -251,7 +251,7 @@ public: void Room::RoomImpl::ServerLoop() { while (state != State::Closed) { ENetEvent event; - if (enet_host_service(server, &event, 50) > 0) { + if (enet_host_service(server, &event, 16) > 0) { switch (event.type) { case ENET_EVENT_TYPE_RECEIVE: switch (event.packet->data[0]) { diff --git a/src/network/room_member.cpp b/src/network/room_member.cpp index e43004027..d67ea8289 100644 --- a/src/network/room_member.cpp +++ b/src/network/room_member.cpp @@ -159,7 +159,7 @@ void RoomMember::RoomMemberImpl::MemberLoop() { while (IsConnected()) { std::lock_guard lock(network_mutex); ENetEvent event; - if (enet_host_service(client, &event, 100) > 0) { + if (enet_host_service(client, &event, 16) > 0) { switch (event.type) { case ENET_EVENT_TYPE_RECEIVE: switch (event.packet->data[0]) { @@ -251,16 +251,18 @@ void RoomMember::RoomMemberImpl::MemberLoop() { break; } } + + std::list packets; { std::lock_guard lock(send_list_mutex); - for (const auto& packet : send_list) { - ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(), - ENET_PACKET_FLAG_RELIABLE); - enet_peer_send(server, 0, enetPacket); - } - enet_host_flush(client); - send_list.clear(); + packets.swap(send_list); } + for (const auto& packet : packets) { + ENetPacket* enetPacket = enet_packet_create(packet.GetData(), packet.GetDataSize(), + ENET_PACKET_FLAG_RELIABLE); + enet_peer_send(server, 0, enetPacket); + } + enet_host_flush(client); } Disconnect(); }; From 7fa64af3d628adf7b2825b89a3cdc8be7f731d0a Mon Sep 17 00:00:00 2001 From: weihuoya Date: Fri, 14 Jan 2022 10:36:49 +0800 Subject: [PATCH 3/3] externals: update enet --- externals/enet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/externals/enet b/externals/enet index 39a72ab19..498b9e357 160000 --- a/externals/enet +++ b/externals/enet @@ -1 +1 @@ -Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0 +Subproject commit 498b9e3571c2e096d7143c3c76852c5ec28d7885