Fix compilation with gcc

Author: DHrpcs3

.github/workflows/rpcsx.yml

@@ -25,14 +25,17 @@ jobs:
       run: |
         sudo apt update
         sudo apt install -y cmake build-essential libunwind-dev \
-        libglfw3-dev libvulkan-dev vulkan-validationlayers-dev \
+        libglfw3-dev libvulkan-dev vulkan-validationlayers \
         libsox-dev
+        echo "deb http://azure.archive.ubuntu.com/ubuntu noble main universe" | sudo tee /etc/apt/sources.list
+        sudo apt update
+        sudo apt install g++-14
         VULKANVER=1.3.259
         curl -sSfLo Vulkan-Headers.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/v${VULKANVER}.tar.gz
         tar -xf Vulkan-Headers*.tar.gz
         cd Vulkan-Headers*/ 
         mkdir build && cd build
-        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+        cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr
         make -j$(nproc)
         sudo make install
 

.gitmodules

@@ -3,7 +3,7 @@
 	url = ../../RPCSX/xbyak.git
 [submodule "3rdparty/SPIRV-Tools"]
 	path = 3rdparty/SPIRV-Tools
-	url = ../../KhronosGroup/SPIRV-Tools.git
+	url = ../../RPCSX/SPIRV-Tools.git
 [submodule "3rdparty/SPIRV-Headers"]
 	path = 3rdparty/SPIRV-Headers
 	url = ../../KhronosGroup/SPIRV-Headers.git

3rdparty/CMakeLists.txt

@@ -13,19 +13,22 @@ if(NOT SPIRV-Tools-opt_FOUND)
 endif()
 
 if(NOT SPIRV-Cross_FOUND)
-    set(SPIRV_CROSS_SHARED on)
-    set(SPIRV_CROSS_STATIC on)
-    set(SPIRV_CROSS_ENABLE_GLSL on)
-    set(SPIRV_CROSS_ENABLE_HLSL off)
-    set(SPIRV_CROSS_ENABLE_MSL off)
-    set(SPIRV_CROSS_ENABLE_CPP off)
-    set(SPIRV_CROSS_ENABLE_REFLECT off)
-    set(SPIRV_CROSS_ENABLE_C_API off)
-    set(SPIRV_CROSS_ENABLE_UTIL off)
-    set(SPIRV_CROSS_CLI off)
-    set(SPIRV_CROSS_ENABLE_TESTS off)
-    set(SPIRV_CROSS_SKIP_INSTALL on)
+    option(SPIRV_CROSS_SHARED "" on)
+    option(SPIRV_CROSS_STATIC "" on)
+    option(SPIRV_CROSS_ENABLE_GLSL "" on)
+    option(SPIRV_CROSS_ENABLE_HLSL "" off)
+    option(SPIRV_CROSS_ENABLE_MSL "" off)
+    option(SPIRV_CROSS_ENABLE_CPP "" off)
+    option(SPIRV_CROSS_ENABLE_REFLECT "" off)
+    option(SPIRV_CROSS_ENABLE_C_API "" off)
+    option(SPIRV_CROSS_ENABLE_UTIL "" off)
+    option(SPIRV_CROSS_CLI "" off)
+    option(SPIRV_CROSS_ENABLE_TESTS "" off)
+    option(SPIRV_CROSS_SKIP_INSTALL "" on)
     add_subdirectory(SPIRV-Cross)
+
+    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 glslang_FOUND)
@@ -38,3 +41,4 @@ endif()
 if(NOT nlohmann_json_FOUND)
     add_subdirectory(json)
 endif()
+

3rdparty/SPIRV-Cross

@@ -49,4 +49,3 @@ amdgpu::Registers::Context amdgpu::Registers::Context::Default = [] {
   result.vgtOutDeallocCntl = 0x10;
   return result;
 }();
-

3rdparty/SPIRV-Tools

@@ -928,4 +928,4 @@ struct Registers {
 };
 
 #pragma pack(pop)
-} // namespace amdgpu
+} // namespace amdgpu

rpcsx-gpu2/Registers.cpp

@@ -5,6 +5,7 @@
 #include <cstdlib>
 #include <gnm/constants.hpp>
 #include <gnm/descriptors.hpp>
+#include <bit>
 
 namespace amdgpu {
 inline constexpr uint32_t kMicroTileWidth = 8;

rpcsx-gpu2/Registers.hpp

@@ -1,11 +1,11 @@
 #include "gnm/constants.hpp"
 #include <amdgpu/tiler.hpp>
-#include <gnm/gnm.hpp>
 #include <bit>
+#include <gnm/gnm.hpp>
 
 using namespace amdgpu;
 
-static constexpr SurfaceInfo
+static SurfaceInfo
 computeTexture1dInfo(ArrayMode arrayMode, gnm::TextureType type,
                      gnm::DataFormat dfmt, std::uint32_t width,
                      std::uint32_t height, std::uint32_t depth,
@@ -167,7 +167,7 @@ computeTexture1dInfo(ArrayMode arrayMode, gnm::TextureType type,
   return result;
 }
 
-static constexpr SurfaceInfo computeTextureLinearInfo(
+static SurfaceInfo computeTextureLinearInfo(
     ArrayMode arrayMode, gnm::TextureType type, gnm::DataFormat dfmt,
     std::uint32_t width, std::uint32_t height, std::uint32_t depth,
     std::uint32_t pitch, int baseArrayLayer, int arrayCount, int baseMipLevel,

rpcsx-gpu2/lib/amdgpu-tiler/include/amdgpu/tiler.hpp

@@ -25,7 +25,7 @@ constexpr int getTexelsPerElement(gnm::DataFormat dfmt) {
   }
 }
 
-inline int getBitsPerElement(DataFormat dfmt) {
+constexpr int getBitsPerElement(DataFormat dfmt) {
   switch (dfmt) {
   case kDataFormatInvalid:
     return 0;