Fix compilation with gcc

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

Hide file tree

Showing 10 changed files with 35 additions and 30 deletions.
diff --git a/.github/workflows/rpcsx.yml b/.github/workflows/rpcsx.yml
@@ -25,21 +25,22 @@ 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
-        make -j$(nproc)
-        sudo make install
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14 -DCMAKE_INSTALL_PREFIX=/usr
+        sudo cmake --build build --target install -j$(nproc)
 
     - name: Build RPCSX
       run: |
-        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_FLAGS_INIT="-march=native" && \
-        cmake --build build -j4
+        cmake -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_CXX_COMPILER=g++-14  -DCMAKE_CXX_FLAGS_INIT="-march=native" && \
+        cmake --build build -j$(nproc)
 
     - name: Upload RPCSX
       uses: actions/upload-artifact@v4

diff --git a/.gitmodules b/.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

diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt
@@ -13,28 +13,32 @@ 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)
+# if(NOT glslang_FOUND)
     add_subdirectory(glslang)
     if(NOT TARGET glslang::glslang-standalone)
         add_executable(glslang::glslang-standalone ALIAS glslang-standalone)
     endif()
-endif()
+# endif()
 
 if(NOT nlohmann_json_FOUND)
     add_subdirectory(json)
 endif()
+
diff --git a/3rdparty/SPIRV-Cross b/3rdparty/SPIRV-Cross
diff --git a/3rdparty/SPIRV-Tools b/3rdparty/SPIRV-Tools
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;

diff --git a/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler.cpp b/rpcsx-gpu2/lib/amdgpu-tiler/src/tiler.cpp
@@ -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,

diff --git a/rpcsx-gpu2/lib/gnm/include/gnm/gnm.hpp b/rpcsx-gpu2/lib/gnm/include/gnm/gnm.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;
+1 −1		.github/workflows/ios.yml
+2 −2		.github/workflows/scorecard.yml
+1 −0		Android.mk
+3 −3		DEPS
+12 −0		include/spirv-tools/optimizer.hpp
+3 −0		source/opt/CMakeLists.txt
+49 −0		source/opt/bitcast_combine_pass.cpp
+32 −0		source/opt/bitcast_combine_pass.h
+128 −0		source/opt/const_folding_rules.cpp
+35 −0		source/opt/optimizer.cpp
+2 −0		source/opt/passes.h
+482 −0		source/opt/struct_packing_pass.cpp
+81 −0		source/opt/struct_packing_pass.h
+2 −2		source/val/validate_cfg.cpp
+12 −8		source/val/validate_extensions.cpp
+1 −7		source/val/validate_image.cpp
+1 −0		test/opt/CMakeLists.txt
+242 −0		test/opt/struct_packing_test.cpp
+2 −40		test/val/val_image_test.cpp
+4 −0		tools/opt/opt.cpp
+2 −1		utils/check_copyright.py
+5 −4		utils/update_build_version.py
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;
		}();