pacnpal/citron
1
0
Fork 0
mirror of https://git.eden-emu.dev/archive/citron synced 2026-03-23 01:56:08 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix(Android): Compilation Issues due to SPIR-V Adjustments

Browse Source
This commit is contained in:
Collecting
2026-02-14 18:25:42 -05:00
parent 475b4fc401
commit eb9cc8941e
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
externals/CMakeLists.txt vendored
View File

@@ -54,9 +54,6 @@ if (NOT TARGET SPIRV-Headers)
endif() endif()
# Sirit # Sirit
# Tell sirit to use our target
set(SIRIT_USE_SYSTEM_SPIRV_HEADERS ON)
list(APPEND CMAKE_PREFIX_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
add_subdirectory(sirit) add_subdirectory(sirit)
# SPIRV-Tools # SPIRV-Tools

12
src/core/hle/service/ssl/ssl_backend_none.cpp
View File

@@ -3,8 +3,9 @@
// SPDX-License-Identifier: GPL-2.0-or-later // SPDX-License-Identifier: GPL-2.0-or-later
#include "common/logging/log.h" #include "common/logging/log.h"
#include "core/internal_network/network.h"
#include "core/hle/service/ssl/ssl_backend.h" #include "core/hle/service/ssl/ssl_backend.h"
#include "core/internal_network/network.h"
#include "core/internal_network/sockets.h"
namespace Service::SSL { namespace Service::SSL {
@@ -45,7 +46,8 @@ public:
LOG_WARNING(Service_SSL, "(STUBBED) Read not implemented on Android"); LOG_WARNING(Service_SSL, "(STUBBED) Read not implemented on Android");
return ResultSuccess; return ResultSuccess;
#else #else
Network::Errno recv_result = socket->Recv(buffer.data(), buffer.size(), 0, *out_size); auto [received, recv_result] = socket->Recv(0, buffer);
*out_size = static_cast<size_t>(received);
if (recv_result == Network::Errno::AGAIN) { if (recv_result == Network::Errno::AGAIN) {
return ResultWouldBlock; return ResultWouldBlock;
} else if (recv_result != Network::Errno::SUCCESS) { } else if (recv_result != Network::Errno::SUCCESS) {
@@ -70,7 +72,8 @@ public:
LOG_WARNING(Service_SSL, "(STUBBED) Write not implemented on Android"); LOG_WARNING(Service_SSL, "(STUBBED) Write not implemented on Android");
return ResultSuccess; return ResultSuccess;
#else #else
Network::Errno send_result = socket->Send(data.data(), data.size(), 0, *out_size); auto [sent, send_result] = socket->Send(data, 0);
*out_size = static_cast<size_t>(sent);
if (send_result == Network::Errno::AGAIN) { if (send_result == Network::Errno::AGAIN) {
return ResultWouldBlock; return ResultWouldBlock;
} else if (send_result != Network::Errno::SUCCESS) { } else if (send_result != Network::Errno::SUCCESS) {
@@ -85,7 +88,8 @@ public:
Result GetServerCerts(std::vector<std::vector<u8>>* out_certs) override { Result GetServerCerts(std::vector<std::vector<u8>>* out_certs) override {
LOG_WARNING(Service_SSL, "(STUBBED) GetServerCerts called"); LOG_WARNING(Service_SSL, "(STUBBED) GetServerCerts called");
// Return an empty certificate to prevent crashes // Return an empty certificate to prevent crashes
out_certs->emplace_back(std::vector<u8>{0x30, 0x82, 0x01, 0x01}); // Minimal dummy DER certificate header out_certs->emplace_back(
std::vector<u8>{0x30, 0x82, 0x01, 0x01}); // Minimal dummy DER certificate header
return ResultSuccess; return ResultSuccess;
} }