CI: fix recent build issues (#6148)

Co-authored-by: Vitor K <vitor-kiguchi@hotmail.com>

.ci/linux-clang-format/script.sh

@@ -7,7 +7,7 @@ if grep -nrI '\s$' src *.yml *.txt *.md Doxyfile .gitignore .gitmodules .ci* dis
 fi
 
 # Default clang-format points to default 3.5 version one
-CLANG_FORMAT=clang-format-10
+CLANG_FORMAT=clang-format-12
 $CLANG_FORMAT --version
 
 if [ "$GITHUB_EVENT_NAME" = "pull_request" ]; then

.ci/linux-mingw/docker.sh

@@ -17,7 +17,7 @@ echo 'Prepare binaries...'
 cd ..
 mkdir package
 
-QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt5/plugins/platforms/'
+QT_PLATFORM_DLL_PATH='/usr/x86_64-w64-mingw32/lib/qt/plugins/platforms/'
 find build/ -name "citra*.exe" -exec cp {} 'package' \;
 
 # copy Qt plugins
@@ -25,6 +25,7 @@ mkdir package/platforms
 cp "${QT_PLATFORM_DLL_PATH}/qwindows.dll" package/platforms/
 cp -rv "${QT_PLATFORM_DLL_PATH}/../mediaservice/" package/
 cp -rv "${QT_PLATFORM_DLL_PATH}/../imageformats/" package/
+cp -rv "${QT_PLATFORM_DLL_PATH}/../styles/" package/
 rm -f package/mediaservice/*d.dll
 
 python3 .ci/linux-mingw/scan_dll.py package/*.exe package/imageformats/*.dll "package/"

.github/workflows/ci.yml

@@ -24,7 +24,9 @@ jobs:
     strategy:
       matrix:
         image: ["linux-fresh", "linux-frozen", "linux-mingw"]
-    container: citraemu/build-environments:${{ matrix.image }}
+    container:
+      image: citraemu/build-environments:${{ matrix.image }}
+      options: -u 1001
     steps:
       - uses: actions/checkout@v3
         with:

CMakeLists.txt

@@ -267,7 +267,7 @@ endif()
 # against all the src files. This should be used before making a pull request.
 # =======================================================================
 
-set(CLANG_FORMAT_POSTFIX "-10")
+set(CLANG_FORMAT_POSTFIX "-12")
 find_program(CLANG_FORMAT
     NAMES clang-format${CLANG_FORMAT_POSTFIX}
           clang-format

CMakeModules/MinGWCross.cmake

@@ -10,8 +10,8 @@ SET(SDL2_PATH                       ${MINGW_PREFIX})
 SET(MINGW_TOOL_PREFIX               ${CMAKE_SYSTEM_PROCESSOR}-w64-mingw32-)
 
 # Specify the cross compiler
-SET(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}gcc-posix)
+SET(CMAKE_C_COMPILER            ${MINGW_TOOL_PREFIX}gcc)
-SET(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}g++-posix)
+SET(CMAKE_CXX_COMPILER          ${MINGW_TOOL_PREFIX}g++)
 SET(CMAKE_RC_COMPILER           ${MINGW_TOOL_PREFIX}windres)
 
 # Mingw tools

src/citra_qt/camera/qt_multimedia_camera.cpp

@@ -16,8 +16,8 @@
 
 namespace Camera {
 
-QList<QVideoFrame::PixelFormat> QtCameraSurface::supportedPixelFormats([
+QList<QVideoFrame::PixelFormat> QtCameraSurface::supportedPixelFormats(
-    [maybe_unused]] QAbstractVideoBuffer::HandleType handleType) const {
+    [[maybe_unused]] QAbstractVideoBuffer::HandleType handleType) const {
     return QList<QVideoFrame::PixelFormat>()
            << QVideoFrame::Format_ARGB32 << QVideoFrame::Format_ARGB32_Premultiplied
            << QVideoFrame::Format_RGB32 << QVideoFrame::Format_RGB24 << QVideoFrame::Format_RGB565

src/common/vector_math.h

@@ -690,8 +690,8 @@ template <typename T>
 
 // linear interpolation via float: 0.0=begin, 1.0=end
 template <typename X>
-[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{}) Lerp(const X& begin, const X& end,
+[[nodiscard]] constexpr decltype(X{} * float{} + X{} * float{})
-                                                                     const float t) {
+    Lerp(const X& begin, const X& end, const float t) {
     return begin * (1.f - t) + end * t;
 }
 

src/core/hle/service/gsp/gsp_gpu.cpp

@@ -436,8 +436,9 @@ void GSP_GPU::SignalInterruptForThread(InterruptId interrupt_id, u32 thread_id)
     //               executing any GSP commands, only waiting on the event.
     // TODO(Subv): The real GSP module triggers PDC0 after updating both the top and bottom
     // screen, it is currently unknown what PDC1 does.
-    int screen_id =
+    int screen_id = (interrupt_id == InterruptId::PDC0)   ? 0
-        (interrupt_id == InterruptId::PDC0) ? 0 : (interrupt_id == InterruptId::PDC1) ? 1 : -1;
+                    : (interrupt_id == InterruptId::PDC1) ? 1
+                                                          : -1;
     if (screen_id != -1) {
         FrameBufferUpdate* info = GetFrameBufferInfo(thread_id, screen_id);
         if (info->is_dirty) {

src/core/tracer/recorder.cpp

@@ -190,8 +190,7 @@ void Recorder::MemoryAccessed(const u8* data, u32 size, u32 physical_address) {
 template <typename T>
 void Recorder::RegisterWritten(u32 physical_address, T value) {
     StreamElement element = {{RegisterWrite}};
-    element.data.register_write.size =
+    element.data.register_write.size = (sizeof(T) == 1)   ? CTRegisterWrite::SIZE_8
-        (sizeof(T) == 1) ? CTRegisterWrite::SIZE_8
                                        : (sizeof(T) == 2) ? CTRegisterWrite::SIZE_16
                                        : (sizeof(T) == 4) ? CTRegisterWrite::SIZE_32
                                                           : CTRegisterWrite::SIZE_64;

src/video_core/regs_pipeline.h

@@ -77,9 +77,9 @@ struct PipelineRegs {
         }
 
         u32 GetElementSizeInBytes(std::size_t n) const {
-            return (GetFormat(n) == VertexAttributeFormat::FLOAT)
+            return (GetFormat(n) == VertexAttributeFormat::FLOAT)   ? 4
-                       ? 4
+                   : (GetFormat(n) == VertexAttributeFormat::SHORT) ? 2
-                       : (GetFormat(n) == VertexAttributeFormat::SHORT) ? 2 : 1;
+                                                                    : 1;
         }
 
         u32 GetStride(std::size_t n) const {