From df8b8533ca5b2bd349872608d09f857210b62bac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 10:36:26 -0300 Subject: [PATCH 1/5] .yml changes to lime-build-environments docker containers --- .github/workflows/build.yml | 4 ++-- .github/workflows/format.yml | 4 ++-- .github/workflows/transifex.yml | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index df43baf99..606d11e95 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -1,4 +1,4 @@ -name: citra-build +name: lime-build on: push: @@ -28,7 +28,7 @@ jobs: matrix: target: ["appimage", "fresh"] container: - image: RyzenDew/build-environments:linux-${{ matrix.target }} + image: polarzincomfrio/lime-build-environments:linux-${{ matrix.target }} options: -u 1001 env: CCACHE_DIR: ${{ github.workspace }}/.ccache diff --git a/.github/workflows/format.yml b/.github/workflows/format.yml index 0d9a30caf..300731d53 100644 --- a/.github/workflows/format.yml +++ b/.github/workflows/format.yml @@ -1,4 +1,4 @@ -name: citra-format +name: lime-format on: push: @@ -10,7 +10,7 @@ jobs: clang-format: runs-on: ubuntu-latest container: - image: citraemu/build-environments:linux-fresh + image: polarzincomfrio/lime-build-environments:linux-fresh options: -u 1001 steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/transifex.yml b/.github/workflows/transifex.yml index 686e54f65..e711fd255 100644 --- a/.github/workflows/transifex.yml +++ b/.github/workflows/transifex.yml @@ -1,4 +1,4 @@ -name: citra-transifex +name: lime-transifex on: push: @@ -7,8 +7,8 @@ on: jobs: transifex: runs-on: ubuntu-latest - container: RyzenDew/build-environments:linux-fresh - if: ${{ github.repository == 'citra-emu/citra' }} + container: polarzincomfrio/lime-build-environments:linux-fresh + if: ${{ github.repository == 'RyzenDew/Lime-3DS-Emulator' }} steps: - uses: actions/checkout@v4 with: @@ -18,3 +18,4 @@ jobs: run: ./.ci/transifex.sh env: TX_TOKEN: ${{ secrets.TRANSIFEX_API_TOKEN }} +# This will never build until there's a Transifex API TOKEN available \ No newline at end of file From b909c6ab1c5042f60aa604eb1005282c67ba147d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 11:02:43 -0300 Subject: [PATCH 2/5] Workflow Trigger --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 062c7ce8b..77b723e63 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ repo/ .ccache/ node_modules/ VULKAN_SDK/ +#adding this here just to trigger the workflows \ No newline at end of file From b58c8e5b473a0c81a45e9bc8b4fac7cac3fe6265 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 11:09:44 -0300 Subject: [PATCH 3/5] Comply to coding style guidelines (error with Clang Build) --- .gitignore | 3 +-- src/core/hle/service/gsp/gsp_gpu.cpp | 3 ++- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 77b723e63..c684e4802 100644 --- a/.gitignore +++ b/.gitignore @@ -47,5 +47,4 @@ repo/ # GitHub Actions generated files .ccache/ node_modules/ -VULKAN_SDK/ -#adding this here just to trigger the workflows \ No newline at end of file +VULKAN_SDK/ \ No newline at end of file diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp index 914e07b03..079f94471 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -362,7 +362,8 @@ void GSP_GPU::SignalInterruptForThread(InterruptId interrupt_id, u32 thread_id) auto* info = GetFrameBufferInfo(thread_id, screen_id); if (info->is_dirty) { system.GPU().SetBufferSwap(screen_id, info->framebuffer_info[info->index]); - // Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0 for bottom + // Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0 + // for bottom info->is_dirty.Assign(screen_id == 0); } } From c27b4e8b7da9df0aeed5f9ee1832e4f476942fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 11:20:47 -0300 Subject: [PATCH 4/5] clang-format fix --- src/core/hle/service/gsp/gsp_gpu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/core/hle/service/gsp/gsp_gpu.cpp b/src/core/hle/service/gsp/gsp_gpu.cpp index 079f94471..0e62eeb39 100644 --- a/src/core/hle/service/gsp/gsp_gpu.cpp +++ b/src/core/hle/service/gsp/gsp_gpu.cpp @@ -362,7 +362,7 @@ void GSP_GPU::SignalInterruptForThread(InterruptId interrupt_id, u32 thread_id) auto* info = GetFrameBufferInfo(thread_id, screen_id); if (info->is_dirty) { system.GPU().SetBufferSwap(screen_id, info->framebuffer_info[info->index]); - // Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0 + // Decompiling the GSP module shows that the dirty bit is assigned 1 for top screen, 0 // for bottom info->is_dirty.Assign(screen_id == 0); } From 667800f6669e8c2efbf2078f54b982f486621876 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Vitor=20Polverari?= Date: Sun, 24 Mar 2024 13:04:36 -0300 Subject: [PATCH 5/5] Commented out the MSYS2 Build for now until it gets resolved --- .github/workflows/build.yml | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 606d11e95..33a84d43c 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -126,10 +126,10 @@ jobs: runs-on: windows-latest strategy: matrix: - target: ["msvc", "msys2"] + target: ["msvc"] # Removing "msys2" from the target list defaults: run: - shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0} + shell: bash {0} #shell: ${{ (matrix.target == 'msys2' && 'msys2') || 'bash' }} {0} env: CCACHE_DIR: ${{ github.workspace }}/.ccache CCACHE_COMPILERCHECK: content @@ -149,20 +149,20 @@ jobs: ${{ runner.os }}-${{ matrix.target }}- - name: Set up MSVC uses: ilammy/msvc-dev-cmd@v1 - if: ${{ matrix.target == 'msvc' }} + # if: ${{ matrix.target == 'msvc' }} - name: Install extra tools (MSVC) run: choco install ccache ninja wget - if: ${{ matrix.target == 'msvc' }} - - name: Set up MSYS2 - uses: msys2/setup-msys2@v2 - if: ${{ matrix.target == 'msys2' }} - with: - msystem: clang64 - update: true - install: git make p7zip - pacboy: >- - toolchain:p ccache:p cmake:p ninja:p - qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p + # if: ${{ matrix.target == 'msvc' }} + # - name: Set up MSYS2 + # uses: msys2/setup-msys2@v2 + # if: ${{ matrix.target == 'msys2' }} + # with: + # msystem: clang64 + # update: true + # install: git make p7zip + # pacboy: >- + # toolchain:p ccache:p cmake:p ninja:p + # qt6-base:p qt6-multimedia:p qt6-multimedia-wmf:p qt6-tools:p qt6-translations:p - name: Disable line ending translation run: git config --global core.autocrlf input - name: Build