Skip to content

[OOPS] #17604

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 7 commits into from
Closed

[OOPS] #17604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
47407e9
vk: move parallel aggregator to cpu-side
awildergoose Oct 19, 2025
fcc295f
chore: dont throw!
awildergoose Oct 19, 2025
68644ef
vk: revert gpu/cpu compute changes
awildergoose Oct 19, 2025
f932632
chore: fix clang build fail
awildergoose Oct 19, 2025
e1b4d96
fix win clang
awildergoose Oct 19, 2025
4cc1a39
Add compiler options for OpenAL based on compiler
awildergoose Oct 19, 2025
a883d3d
Merge pull request #1 from awildergoose/awildergoose-patch-1-1
awildergoose Oct 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions 3rdparty/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,12 @@ if(USE_SDL)
endif()

# OpenAL
if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" OR CMAKE_CXX_COMPILER_ID MATCHES "GNU")
add_compile_options(-include cstdlib)
elseif(MSVC)
add_compile_options(/FI cstdlib)
endif()

if (NOT ANDROID)
add_subdirectory(OpenAL EXCLUDE_FROM_ALL)
else()
Expand Down
10 changes: 10 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,6 +132,16 @@ if(MSVC)
add_compile_options(/MP)
endif()

if (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
if (NOT CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|arm64")
add_compile_options(-msse4.1 -mavx2 -mfma -march=native -O3)
else()
add_compile_options(-O3)
endif()
elseif (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
add_compile_options(/arch:AVX2 /O2)
endif()

if(NOT CMAKE_SIZEOF_VOID_P EQUAL 8)
message( FATAL_ERROR "RPCS3 can only be compiled on 64-bit platforms." )
endif()
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/VK/VKCompute.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,4 +369,4 @@ namespace vk
const u32 linear_invocations = utils::aligned_div(word_count, optimal_group_size);
compute_task::run(cmd, linear_invocations);
}
}
}