Accepting request 1034565 from X11:XOrg
- third bugfix release * some regressions in CI worked out * a bit of everything, and nothing too crazy - supersedes u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch - supersedes u_nouveau-corrupted-colors-boo1203949.patch - get rid of Mesa-libVulkan-devel(-32bit) package, which is no longer needed at all by providing/obsoleting it by libvulkan_intel OBS-URL: https://build.opensuse.org/request/show/1034565 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=459
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
2223a58b53
12
Mesa.changes
12
Mesa.changes
@ -1,3 +1,15 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 8 12:24:26 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
- third bugfix release
|
||||
* some regressions in CI worked out
|
||||
* a bit of everything, and nothing too crazy
|
||||
- supersedes u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch
|
||||
- supersedes u_nouveau-corrupted-colors-boo1203949.patch
|
||||
- get rid of Mesa-libVulkan-devel(-32bit) package, which is no
|
||||
longer needed at all by providing/obsoleting it by
|
||||
libvulkan_intel
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Nov 7 15:28:21 UTC 2022 - Stefan Dirsch <sndirsch@suse.com>
|
||||
|
||||
|
||||
11
Mesa.spec
11
Mesa.spec
@ -42,7 +42,7 @@
|
||||
|
||||
%define glamor 1
|
||||
%define _name_archive mesa
|
||||
%define _version 22.2.2
|
||||
%define _version 22.2.3
|
||||
%define with_opencl 0
|
||||
%define with_vulkan 0
|
||||
%define with_llvm 0
|
||||
@ -119,7 +119,7 @@
|
||||
%endif
|
||||
|
||||
Name: Mesa%{psuffix}
|
||||
Version: 22.2.2
|
||||
Version: 22.2.3
|
||||
Release: 0
|
||||
Summary: System for rendering 3-D graphics
|
||||
License: MIT
|
||||
@ -139,11 +139,9 @@ Patch54: n_drirc-disable-rgb10-for-chromium-on-amd.patch
|
||||
Patch58: u_dep_xcb.patch
|
||||
Patch100: U_fix-mpeg1_2-decode-mesa-20.2.patch
|
||||
Patch200: u_fix-build-on-ppc64le.patch
|
||||
Patch201: u_0001-gallivm-Fix-LLVM-optimization-with-the-new-pass-mana.patch
|
||||
Patch300: n_buildfix-21.3.0.patch
|
||||
Patch400: n_no-sse2-on-ix86-except-for-intel-drivers.patch
|
||||
Patch500: n_stop-iris-flicker.patch
|
||||
Patch600: u_nouveau-corrupted-colors-boo1203949.patch
|
||||
%ifarch %{ix86} x86_64
|
||||
BuildRequires: DirectX-Headers
|
||||
%endif
|
||||
@ -678,6 +676,9 @@ Summary: Mesa vulkan driver for Intel GPU
|
||||
Group: System/Libraries
|
||||
Supplements: modalias(pci:v00008086d*sv*sd*bc03sc*i*)
|
||||
Requires: Mesa-vulkan-device-select
|
||||
# get rid of this package, which is no longer neeeded at all
|
||||
Provides: Mesa-libVulkan-devel = 22.0.0
|
||||
Obsoletes: Mesa-libVulkan-devel < 22.0.0
|
||||
|
||||
%description -n libvulkan_intel
|
||||
This package contains the Vulkan parts for Mesa.
|
||||
@ -770,13 +771,11 @@ rm -rf docs/README.{VMS,WIN32,OS2}
|
||||
%patch58 -p1
|
||||
%patch100 -p1
|
||||
%patch200 -p1
|
||||
%patch201 -p1
|
||||
%patch300 -p1
|
||||
%ifarch %{ix86}
|
||||
%patch400 -p1
|
||||
%endif
|
||||
%patch500 -p1
|
||||
%patch600 -p1
|
||||
|
||||
# Remove requires to vulkan libs from baselibs.conf on platforms
|
||||
# where vulkan build is disabled; ugly ...
|
||||
|
||||
@ -79,6 +79,8 @@ libvulkan_intel
|
||||
targetarch ppc64le +/usr/share/vulkan/icd.d/intel_icd.*.json
|
||||
targetarch x86_64 +/usr/share/vulkan/icd.d/intel_icd.*.json
|
||||
requires "Mesa-vulkan-device-select-<targettype> = <version>"
|
||||
provides "Mesa-libVulkan-devel-<targettype> = 22.0.0"
|
||||
obsoletes "Mesa-libVulkan-devel-<targettype> < 22.0.0"
|
||||
libvulkan_radeon
|
||||
targetarch aarch64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
|
||||
targetarch ppc64 +/usr/share/vulkan/icd.d/radeon_icd.*.json
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2de11fb74fc5cc671b818e49fe203cea0cd1d8b69756e97cdb06a2f4e78948f9
|
||||
size 16424508
|
||||
Binary file not shown.
3
mesa-22.2.3.tar.xz
Normal file
3
mesa-22.2.3.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:ee7d026f7b1991dbae0861d359b671145c3a86f2a731353b885d2ea2d5c098d6
|
||||
size 16464020
|
||||
BIN
mesa-22.2.3.tar.xz.sig
Normal file
BIN
mesa-22.2.3.tar.xz.sig
Normal file
Binary file not shown.
@ -1,92 +0,0 @@
|
||||
From 7d6df34deeed5a42163f9b548945e4d785ba48cf Mon Sep 17 00:00:00 2001
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Fri, 21 Oct 2022 11:20:31 +0200
|
||||
Subject: [PATCH] gallivm: Fix LLVM optimization with the new pass manager
|
||||
|
||||
The previous list of passes contained several errors: "constprop" does not
|
||||
exist anymore and a trailing ',' is not allowed. This made LLVMRunPasses
|
||||
fail, but the error is silently ignored. Thus none of the listed passes
|
||||
ran at all.
|
||||
|
||||
https://reviews.llvm.org/D85159 suggests "InstSimplify really should be
|
||||
used anywhere ConstProp is being used" so replace constprop with
|
||||
instsimplify and remove the trailing comma.
|
||||
|
||||
By enabling pass logging with
|
||||
LLVMPassBuilderOptionsSetDebugLogging(opts, true),
|
||||
the difference is visible. Before:
|
||||
|
||||
Running pass: AlwaysInlinerPass on [module]
|
||||
Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module> on [module]
|
||||
Running analysis: ProfileSummaryAnalysis on [module]
|
||||
Running pass: CoroConditionalWrapper on [module]
|
||||
Running pass: AnnotationRemarksPass on fs_variant_partial (1162 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_partial
|
||||
Running pass: AnnotationRemarksPass on fs_variant_whole (1110 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_whole
|
||||
|
||||
After:
|
||||
|
||||
Running pass: AlwaysInlinerPass on [module]
|
||||
Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module> on [module]
|
||||
Running analysis: ProfileSummaryAnalysis on [module]
|
||||
Running pass: CoroConditionalWrapper on [module]
|
||||
Running pass: AnnotationRemarksPass on fs_variant_partial (1162 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_partial
|
||||
Running pass: AnnotationRemarksPass on fs_variant_whole (1110 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_whole
|
||||
Running analysis: InnerAnalysisManagerProxy<llvm::FunctionAnalysisManager, llvm::Module> on [module]
|
||||
Running pass: SROAPass on fs_variant_partial (1162 instructions)
|
||||
Running analysis: DominatorTreeAnalysis on fs_variant_partial
|
||||
Running analysis: AssumptionAnalysis on fs_variant_partial
|
||||
Running analysis: TargetIRAnalysis on fs_variant_partial
|
||||
Running pass: EarlyCSEPass on fs_variant_partial (1111 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_partial
|
||||
Running pass: SimplifyCFGPass on fs_variant_partial (961 instructions)
|
||||
Running pass: ReassociatePass on fs_variant_partial (961 instructions)
|
||||
Running pass: PromotePass on fs_variant_partial (897 instructions)
|
||||
Running pass: InstCombinePass on fs_variant_partial (897 instructions)
|
||||
Running analysis: OptimizationRemarkEmitterAnalysis on fs_variant_partial
|
||||
Running analysis: AAManager on fs_variant_partial
|
||||
Running analysis: BasicAA on fs_variant_partial
|
||||
Running analysis: ScopedNoAliasAA on fs_variant_partial
|
||||
Running analysis: TypeBasedAA on fs_variant_partial
|
||||
Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on fs_variant_partial
|
||||
Running pass: SROAPass on fs_variant_whole (1110 instructions)
|
||||
Running analysis: DominatorTreeAnalysis on fs_variant_whole
|
||||
Running analysis: AssumptionAnalysis on fs_variant_whole
|
||||
Running analysis: TargetIRAnalysis on fs_variant_whole
|
||||
Running pass: EarlyCSEPass on fs_variant_whole (1059 instructions)
|
||||
Running analysis: TargetLibraryAnalysis on fs_variant_whole
|
||||
Running pass: SimplifyCFGPass on fs_variant_whole (912 instructions)
|
||||
Running pass: ReassociatePass on fs_variant_whole (912 instructions)
|
||||
Running pass: PromotePass on fs_variant_whole (844 instructions)
|
||||
Running pass: InstCombinePass on fs_variant_whole (844 instructions)
|
||||
Running analysis: OptimizationRemarkEmitterAnalysis on fs_variant_whole
|
||||
Running analysis: AAManager on fs_variant_whole
|
||||
Running analysis: BasicAA on fs_variant_whole
|
||||
Running analysis: ScopedNoAliasAA on fs_variant_whole
|
||||
Running analysis: TypeBasedAA on fs_variant_whole
|
||||
Running analysis: OuterAnalysisManagerProxy<llvm::ModuleAnalysisManager, llvm::Function> on fs_variant_whole
|
||||
|
||||
Fixes: 2037c34f245 ("gallivm: move to new pass manager to handle coroutines change.")
|
||||
---
|
||||
src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
index f77aac75b76..cc410cc1928 100644
|
||||
--- a/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c
|
||||
@@ -601,7 +601,7 @@ gallivm_compile_module(struct gallivm_state *gallivm)
|
||||
LLVMRunPasses(gallivm->module, passes, LLVMGetExecutionEngineTargetMachine(gallivm->engine), opts);
|
||||
|
||||
if (!(gallivm_perf & GALLIVM_PERF_NO_OPT))
|
||||
- strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,constprop,instcombine,");
|
||||
+ strcpy(passes, "sroa,early-cse,simplifycfg,reassociate,mem2reg,instsimplify,instcombine");
|
||||
else
|
||||
strcpy(passes, "mem2reg");
|
||||
|
||||
--
|
||||
2.38.0
|
||||
|
||||
@ -1,51 +0,0 @@
|
||||
From 6014a642ae24e37c287adbf41d615efa18d0da3d Mon Sep 17 00:00:00 2001
|
||||
From: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Date: Tue, 1 Nov 2022 23:01:50 +0100
|
||||
Subject: [PATCH] nv50/ir/nir: ignore sampler for TXF/TXQ ops.
|
||||
|
||||
Recently, a regression was reported where videos in Firefox had shifted/
|
||||
glitched colors on certain Kepler hardware. This was bisected to
|
||||
bf02bffe156214dad942f56ee68c380d1968704f, however, the issue already
|
||||
existed but didn't hit users until TGSI was switched to NIR as default.
|
||||
|
||||
The issue was traced to a YUV-to-RGB fragment shader used by Firefox,
|
||||
which uses three samplers for the Y/U/V components. The Y component was
|
||||
handled correctly, but the U/V components were bogus, causing the issue.
|
||||
|
||||
After analysis, it appears the TXF/TXQ ops. should only handle the texture
|
||||
(r) but not the sampler (s), see 63b850403c90f33c295d3ad6be4ad749d4ea6274
|
||||
and 346ce0b98832e33d5411200002571b3edea9e2bb.
|
||||
Similarly, handleTXQ/handleTXF on nv50_ir_from_tgsi always sets s=0.
|
||||
Only Kepler was affected because other hardware ignores s at codegen.
|
||||
|
||||
Always set s=0 on NIR for TXF/TXQ, to keep TGSI behavior and fix the
|
||||
regression.
|
||||
|
||||
Thanks: Karol Herbst and M Henning for help diagnosing the issue.
|
||||
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7416
|
||||
Cc: mesa-stable
|
||||
Suggested-by: Karol Herbst <kherbst@redhat.com>
|
||||
Reviewed-by: Karol Herbst <kherbst@redhat.com>
|
||||
Reviewed-by: M Henning <drawoc@darkrefraction.com>
|
||||
Signed-off-by: Joan Bruguera <joanbrugueram@gmail.com>
|
||||
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19453>
|
||||
---
|
||||
src/nouveau/codegen/nv50_ir_from_nir.cpp | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/src/nouveau/codegen/nv50_ir_from_nir.cpp b/src/nouveau/codegen/nv50_ir_from_nir.cpp
|
||||
index cbefa93d25fa..4550acbf180d 100644
|
||||
--- a/src/nouveau/codegen/nv50_ir_from_nir.cpp
|
||||
+++ b/src/nouveau/codegen/nv50_ir_from_nir.cpp
|
||||
@@ -3133,6 +3133,8 @@ Converter::visit(nir_tex_instr *insn)
|
||||
|
||||
r = bindless ? 0xff : insn->texture_index;
|
||||
s = bindless ? 0x1f : insn->sampler_index;
|
||||
+ if (op == OP_TXF || op == OP_TXQ)
|
||||
+ s = 0;
|
||||
|
||||
defs.resize(newDefs.size());
|
||||
for (uint8_t d = 0u; d < newDefs.size(); ++d) {
|
||||
--
|
||||
GitLab
|
||||
|
||||
Loading…
Reference in New Issue
Block a user