diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 7b434862acc..4f4d080ef44 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -5,7 +5,7 @@ name: Build and Release on: push: - branches: [ "mainBB" ] + branches: [ "Full-BB" ] pull_request: branches: [ "*" ] @@ -385,8 +385,8 @@ jobs: name: shadps4-linux-qt-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }} path: Shadps4-qt.AppImage - pre-release: - if: github.ref == 'refs/heads/mainBB' && github.event_name == 'push' + release: + if: github.ref == 'refs/heads/Full-BB' && github.event_name == 'push' needs: [get-info, windows-sdl, windows-qt, macos-sdl, macos-qt, linux-sdl, linux-qt] runs-on: ubuntu-latest steps: @@ -415,19 +415,19 @@ jobs: latest_release_info=$(curl -H "Authorization: token $GITHUB_TOKEN" "$api_url/releases/latest") echo "last_release_tag=$(echo "$latest_release_info" | jq -r '.tag_name')" >> $GITHUB_ENV - - name: Create Pre-Release on GitHub + - name: Create Release on GitHub id: create_release uses: ncipollo/release-action@v1 with: token: ${{ secrets.SHADPS4_TOKEN_REPO }} - name: "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}" - tag: "Pre-release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}" + name: "release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}" + tag: "release-shadPS4-${{ needs.get-info.outputs.date }}-${{ needs.get-info.outputs.shorthash }}" draft: false prerelease: true body: "Full Changelog: [${{ env.last_release_tag }}...${{ needs.get-info.outputs.shorthash }}](https://github.com/diegolix29/shadPS4/compare/${{ env.last_release_tag }}...${{ needs.get-info.outputs.shorthash }})" artifacts: ./artifacts/*.zip - - name: Get current pre-release information + - name: Get current release information env: GITHUB_TOKEN: ${{ secrets.SHADPS4_TOKEN_REPO }} run: | @@ -436,7 +436,7 @@ jobs: # Get all releases (sorted by date) releases=$(curl -H "Authorization: token $GITHUB_TOKEN" "$api_url") - # Capture the most recent pre-release (assuming the first one is the latest) + # Capture the most recent release (assuming the first one is the latest) current_release=$(echo "$releases" | jq -c '.[] | select(.prerelease == true) | .published_at' | sort -r | head -n 1) # Remove extra quotes from captured date @@ -445,13 +445,13 @@ jobs: # Export the current published_at to be available for the next step echo "CURRENT_PUBLISHED_AT=$current_release" >> $GITHUB_ENV - - name: Delete old pre-releases and tags + - name: Delete old releases and tags env: GITHUB_TOKEN: ${{ secrets.SHADPS4_TOKEN_REPO }} run: | api_url="https://api.github.com/repos/${{ github.repository }}/releases" - # Get current pre-releases + # Get current releases releases=$(curl -H "Authorization: token $GITHUB_TOKEN" "$api_url") # Remove extra quotes from captured date @@ -460,7 +460,7 @@ jobs: # Convert CURRENT_PUBLISHED_AT para timestamp Unix current_published_ts=$(date -d "$CURRENT_PUBLISHED_AT" +%s) - # Identify pre-releases + # Identify releases echo "$releases" | jq -c '.[] | select(.prerelease == true)' | while read -r release; do release_date=$(echo "$release" | jq -r '.published_at') release_id=$(echo "$release" | jq -r '.id') @@ -472,14 +472,14 @@ jobs: # Convert release_date para timestamp Unix release_date_ts=$(date -d "$release_date" +%s) - # Compare timestamps and delete old pre-releases + # Compare timestamps and delete old releases if [[ "$release_date_ts" -lt "$current_published_ts" ]]; then - echo "Deleting old pre-release: $release_id from $release_date with tag: $release_tag" - # Delete the pre-release + echo "Deleting old release: $release_id from $release_date with tag: $release_tag" + # Delete the release curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" "$api_url/$release_id" # Delete the tag curl -X DELETE -H "Authorization: token $GITHUB_TOKEN" "https://api.github.com/repos/${{ github.repository }}/git/refs/tags/$release_tag" else - echo "Skipping pre-release: $release_id (newer or same date)" + echo "Skipping release: $release_id (newer or same date)" fi done diff --git a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp index ea68730e970..b116cba7cad 100644 --- a/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp +++ b/src/video_core/renderer_vulkan/vk_pipeline_cache.cpp @@ -191,8 +191,9 @@ const ComputePipeline* PipelineCache::GetComputePipeline() { } bool ShouldSkipShader(u64 shader_hash, const char* shader_type) { - static constexpr std::array skip_hashes = {0xaa9d023d, 0x17a64a21, 0x94ec4dfb, - 0xc8854a11}; + static constexpr std::array skip_hashes = { + 0x4899010a, 0xc8854a11, 0xaa9d023d, 0x17a64a21, 0x94ec4dfb, 0xbddb8fc7, 0x733dae6f, + 0x9a987165, 0x70ffb249, 0x34e9da69, 0xbfed1ef4, 0x6faab5f9, 0x125a83c1}; if (std::ranges::contains(skip_hashes, shader_hash)) { LOG_WARNING(Render_Vulkan, "Skipped {} shader hash {:#x}.", shader_type, shader_hash); return true;