Skip to content

Commit 2a9f116

Browse files
committed
Merge remote-tracking branch 'shad_upstream/main' into rb4-new
2 parents 28251fc + 19cb4ec commit 2a9f116

File tree

3 files changed

+6
-2
lines changed

3 files changed

+6
-2
lines changed

src/core/libraries/system/userservice.cpp

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
22
// SPDX-License-Identifier: GPL-2.0-or-later
33

4+
#include "common/config.h"
45
#include "common/logging/log.h"
6+
57
#include "core/libraries/error_codes.h"
68
#include "core/libraries/libs.h"
79
#include "core/libraries/system/userservice.h"
@@ -1071,7 +1073,7 @@ s32 PS4_SYSV_ABI sceUserServiceGetUserName(int user_id, char* user_name, std::si
10711073
LOG_ERROR(Lib_UserService, "user_name is null");
10721074
return ORBIS_USER_SERVICE_ERROR_INVALID_ARGUMENT;
10731075
}
1074-
std::string name = "shadps4"; // TODO onfigurable username
1076+
std::string name = Config::getUserName();
10751077
if (size < name.length()) {
10761078
LOG_ERROR(Lib_UserService, "buffer is too short");
10771079
return ORBIS_USER_SERVICE_ERROR_BUFFER_TOO_SHORT;

src/shader_recompiler/frontend/translate/vector_alu.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,8 @@ void Translator::EmitVectorAlu(const GcnInst& inst) {
242242
return V_CMP_U32(ConditionOp::LG, true, false, inst);
243243
case Opcode::V_CMP_GE_I32:
244244
return V_CMP_U32(ConditionOp::GE, true, false, inst);
245+
case Opcode::V_CMPX_LE_I32:
246+
return V_CMP_U32(ConditionOp::LE, true, true, inst);
245247

246248
// V_CMPX_{OP8}_I32
247249
case Opcode::V_CMPX_LT_I32:

src/video_core/renderer_vulkan/vk_instance.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,13 +304,13 @@ bool Instance::CreateDevice() {
304304
.shaderDrawParameters = true,
305305
},
306306
vk::PhysicalDeviceVulkan12Features{
307+
.samplerMirrorClampToEdge = vk12_features.samplerMirrorClampToEdge,
307308
.shaderFloat16 = vk12_features.shaderFloat16,
308309
.scalarBlockLayout = vk12_features.scalarBlockLayout,
309310
.uniformBufferStandardLayout = vk12_features.uniformBufferStandardLayout,
310311
.separateDepthStencilLayouts = vk12_features.separateDepthStencilLayouts,
311312
.hostQueryReset = vk12_features.hostQueryReset,
312313
.timelineSemaphore = vk12_features.timelineSemaphore,
313-
.samplerMirrorClampToEdge = vk12_features.samplerMirrorClampToEdge,
314314
},
315315
vk::PhysicalDeviceMaintenance4FeaturesKHR{
316316
.maintenance4 = true,

0 commit comments

Comments
 (0)