From 8382a8504c091d2773992415462d665902e38f08 Mon Sep 17 00:00:00 2001
From: DH <dh.rpcs3@gmail.com>
Date: Wed, 25 Sep 2024 18:45:48 +0300
Subject: [PATCH] Fix compilation with gcc

---
 3rdparty/CMakeLists.txt                              | 3 +++
 rpcsx-gpu2/Registers.cpp                             | 1 -
 rpcsx-gpu2/Registers.hpp                             | 2 +-
 rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
index a9cdf26e..1e45224e 100644
--- 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
index 6a834ff3..1a1a0a2b 100644
--- 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
index 65adffe7..b1c13765 100644
--- a/rpcsx-gpu2/Registers.hpp
+++ b/rpcsx-gpu2/Registers.hpp
@@ -928,4 +928,4 @@ struct Registers {
 };
 
 #pragma pack(pop)
-} // namespace amdgpu
\ No newline at end of file
+} // namespace amdgpu
diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp b/rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp
index d53d6f56..64d0d466 100644
--- 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;