Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sailfishos-mirror/mesa
base: 9110f5051af4ba6efc74a944d9db37220277dd7e
Choose a base ref
...
head repository: sailfishos-mirror/mesa
compare: 296ce1ca18685e42fc9d7aa1d63e18493d7174d1
Choose a head ref
  • 13 commits
  • 20 files changed
  • 5 contributors

Commits on Jun 30, 2021

  1. .pick_status.json: Update to e4f762a

    @1ace
    1ace committed Jun 30, 2021
    Copy the full SHA
    8584953 View commit details
    Browse the repository at this point in the history

  2. util/tests: initialise key in cache_test 

    Fixes: e849564 ("glsl/tests: changes to test_disk_cache_create test")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2631

Reviewed-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11623>
(cherry picked from commit a917c74)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    f9ff35b View commit details
    Browse the repository at this point in the history

  3. mesa: don't crash on incorrect texture use 

    Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4995

Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11603>
(cherry picked from commit 328ea8e)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    f2a5274 View commit details
    Browse the repository at this point in the history

  4. i965: don't crash on incorrect texture use 

    Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4995

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11603>
(cherry picked from commit 02dd03f)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    0759c1d View commit details
    Browse the repository at this point in the history

  5. glsl: force_glsl_version to shaders with no defined version 

    If a shader has no defined version force_glsl_version was
previous ignored and the shader would default to 110. This updates
the code so that those shaders are forced to a new level also.

We reused the existing code to make sure a sensible value is set
for the version.

Cc: mesa-stable

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11602>
(cherry picked from commit e607205)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    7086b41 View commit details
    Browse the repository at this point in the history

  6. util/driconf: add new ignore_write_to_readonly_var workaround 

    This forces the GLSL compiler to ignore writes to readonly vars
rather than throwing an error.

Cc: mesa-stable

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11602>
(cherry picked from commit a73e730)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    633eec4 View commit details
    Browse the repository at this point in the history

  7. util: add some workarounds for the game Luna Sky 

    Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4948

Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11602>
(cherry picked from commit 01fa90b)
    @tarceri @1ace
    tarceri authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    a452b88 View commit details
    Browse the repository at this point in the history

  8. intel/perf: use the right popcount for 64bits 

    We're currently using the 32bit version which is dropping half the
bits of the 64bits values.

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Cc: mesa-stable
Reviewed-by: Sagar Ghuge <sagar.ghuge@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11607>
(cherry picked from commit 71b7c7b)
    @llandwerlin-intel @1ace
    llandwerlin-intel authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    f3e3a81 View commit details
    Browse the repository at this point in the history

  9. radeonsi: fix fb_too_small condition 

    fb->num_layers can be 0 so use util_num_layers(tex) instead.

Fixes: f7c5855 ("radeonsi: refine fast clears for small buffers, always use them for large HTILE")
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4764
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit b72c7c6)
    @peppsac @1ace
    peppsac authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    9aa5c99 View commit details
    Browse the repository at this point in the history

  10. radeonsi/gfx7: always sync pfp/me 

    Workaround for https://gitlab.freedesktop.org/mesa/mesa/-/issues/4764

Fixes: c532616 ("radeonsi: add SI_CONTEXT_PFP_SYNC_ME to skip syncing PFP for image operations")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit 822f377)
    @peppsac @1ace
    peppsac authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    fe04c10 View commit details
    Browse the repository at this point in the history

  11. ac/surface: don't print stencil info if tex has no stencil 

    color/zs are stored in a union so testing for zs.stencil_offset
isn't the correct way to test for stencil.

Fixes: 988f148 ("ac/surface: overlap color and Z/S fields using a union in gfx9_surf_layout")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit c564841)
    @peppsac @1ace
    peppsac authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    b00656a View commit details
    Browse the repository at this point in the history

  12. radeonsi/driconf: add workaround for SpaceEngine 

    Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/4483
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11625>
(cherry picked from commit a92dcc4)
    @peppsac @1ace
    peppsac authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    d336bba View commit details
    Browse the repository at this point in the history

  13. nir: return progress from nir_lower_packing 

    Compiling with clang warns about an unused variable in
nir_lower_packing.

Tracking progress was added to nir_lower_packing in
adb157d but the function
will ignore the progress from impl calls and always return
false.

This patch changes it to return the progress. It fixes the
warning and should enable validation calls in NIR_PASS when
progress is made.

Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Fixes: adb157d "nir: Return progress from nir_lower_64bit_pack()"
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11615>
(cherry picked from commit ed530ac)
    @phomes @1ace
    phomes authored and 1ace committed Jun 30, 2021
    Copy the full SHA
    296ce1c View commit details
    Browse the repository at this point in the history