citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #5804 from weihuoya/minorfx 

Minor fx
This commit is contained in:
SachinVin 2022-01-30 21:51:11 +05:30 committed by GitHub
parent 4e15823db2 7fa64af3d6
commit d35a7a8e23
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
externals/enet vendored

@ -1 +1 @@
Subproject commit 39a72ab1990014eb399cee9d538fd529df99c6a0
Subproject commit 498b9e3571c2e096d7143c3c76852c5ec28d7885

2
src/network/room.cpp
View File

@ -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]) {

10
src/network/room_member.cpp
View File

@ -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<Packet> packets;
{
std::lock_guard lock(send_list_mutex);
for (const auto& packet : send_list) {
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);
send_list.clear();
}
}
Disconnect();
};

2
src/video_core/renderer_opengl/gl_shader_gen.cpp
View File

@ -113,7 +113,7 @@ out gl_PerVertex {
}
PicaFSConfig PicaFSConfig::BuildFromRegs(const Pica::Regs& regs) {
PicaFSConfig res;
PicaFSConfig res{};
auto& state = res.state;