Fix compilation with gcc

RPCSX · Sep 25, 2024 · 8382a85 · 8382a85
1 parent 6019477
commit 8382a85
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -33,8 +33,11 @@ if(NOT glslang_FOUND)
     if(NOT TARGET glslang::glslang-standalone)
         add_executable(glslang::glslang-standalone ALIAS glslang-standalone)
     endif()
+    install(TARGETS spirv-cross-c-shared LIBRARY DESTINATION bin)
+    set_target_properties(spirv-cross-c-shared PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 endif()
 
 if(NOT nlohmann_json_FOUND)
     add_subdirectory(json)
 endif()
+
diff --git a/rpcsx-gpu2/Registers.cpp b/rpcsx-gpu2/Registers.cpp
@@ -49,4 +49,3 @@ amdgpu::Registers::Context amdgpu::Registers::Context::Default = [] {
   result.vgtOutDeallocCntl = 0x10;
   return result;
 }();
-
diff --git a/rpcsx-gpu2/Registers.hpp b/rpcsx-gpu2/Registers.hpp
@@ -928,4 +928,4 @@ struct Registers {
 };
 
 #pragma pack(pop)
-} // namespace amdgpu
+} // namespace amdgpu
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp b/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp
@@ -5,6 +5,7 @@
 #include <cstdlib>
 #include <gnm/constants.hpp>
 #include <gnm/descriptors.hpp>
+#include <bit>
 
 namespace amdgpu {
 inline constexpr uint32_t kMicroTileWidth = 8;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -49,4 +49,3 @@ amdgpu::Registers::Context amdgpu::Registers::Context::Default = [] {
		result.vgtOutDeallocCntl = 0x10;
		return result;
		}();