Skip to content

Commit ddadb69

Browse files
committed
Merge commit '2c0f986c5274a34902a1e3e10c6fc578d0b85989' of https://github.com/shadps4-emu/shadPS4 into rb4-test3
2 parents 9d8c0ed + 2c0f986 commit ddadb69

20 files changed

+1022
-328
lines changed

CMakeLists.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ if (NOT CMAKE_BUILD_TYPE)
1616
set(CMAKE_BUILD_TYPE Release)
1717
endif()
1818

19-
project(shadPS4)
19+
project(shadPS4 CXX C ASM)
2020

2121
# Forcing PIE makes sure that the base address is high enough so that it doesn't clash with the PS4 memory.
2222
if(UNIX AND NOT APPLE)
@@ -392,7 +392,8 @@ set(USBD_LIB src/core/libraries/usbd/usbd.cpp
392392
src/core/libraries/usbd/usbd.h
393393
)
394394

395-
set(FIBER_LIB src/core/libraries/fiber/fiber.cpp
395+
set(FIBER_LIB src/core/libraries/fiber/fiber_context.s
396+
src/core/libraries/fiber/fiber.cpp
396397
src/core/libraries/fiber/fiber.h
397398
src/core/libraries/fiber/fiber_error.h
398399
)
@@ -630,6 +631,8 @@ set(SHADER_RECOMPILER src/shader_recompiler/exception.h
630631
src/shader_recompiler/backend/spirv/emit_spirv_instructions.h
631632
src/shader_recompiler/backend/spirv/emit_spirv_integer.cpp
632633
src/shader_recompiler/backend/spirv/emit_spirv_logical.cpp
634+
src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.cpp
635+
src/shader_recompiler/backend/spirv/emit_spirv_quad_rect.h
633636
src/shader_recompiler/backend/spirv/emit_spirv_select.cpp
634637
src/shader_recompiler/backend/spirv/emit_spirv_shared_memory.cpp
635638
src/shader_recompiler/backend/spirv/emit_spirv_special.cpp

src/common/io_file.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,7 @@ class IOFile final {
207207
return WriteSpan(string);
208208
}
209209

210-
static size_t WriteBytes(const std::filesystem::path path, std::span<const u8> data) {
210+
static size_t WriteBytes(const std::filesystem::path path, const auto& data) {
211211
IOFile out(path, FileAccessMode::Write);
212212
return out.Write(data);
213213
}

0 commit comments

Comments
 (0)