mirror of
https://abf.rosa.ru/djam/mesa.git
synced 2025-02-23 22:52:53 +00:00
Merge branch 'rosa2019.1' into rosa2019.0
This commit is contained in:
commit
631ec801fe
4 changed files with 41 additions and 53 deletions
4
.abf.yml
4
.abf.yml
|
@ -1,3 +1,3 @@
|
|||
sources:
|
||||
mesa-18.3.6.tar.xz: cc7cb8cef999bc89142eaf5e162fcb24f6569645
|
||||
mesa-18.3.6.tar.xz.sig: 274c219cbf0ef870a9c437de1f9b35ca6b54aa46
|
||||
mesa-19.2.1.tar.xz: 8ba7cb66799d5372923651f193f84d498b35c9a5
|
||||
mesa-19.2.1.tar.xz.sig: f94225ee9de438f1ceb0cffa7731023aaede98a1
|
||||
|
|
27
0001-gallium-Disable-rgb10-configs-by-default.patch
Normal file
27
0001-gallium-Disable-rgb10-configs-by-default.patch
Normal file
|
@ -0,0 +1,27 @@
|
|||
From b33c8b56abcc4837f96f7f106b108681858482e0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Tue, 24 Apr 2018 09:46:41 +0200
|
||||
Subject: [PATCH] gallium: Disable rgb10 configs by default
|
||||
|
||||
Applications tend to not handle rgb10 configs very well, so lets
|
||||
disable it for now.
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1560481
|
||||
---
|
||||
src/gallium/auxiliary/pipe-loader/driinfo_gallium.h | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
index 21dc599dc2..23f9194149 100644
|
||||
--- a/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
+++ b/src/gallium/auxiliary/pipe-loader/driinfo_gallium.h
|
||||
@@ -33,5 +33,5 @@ DRI_CONF_SECTION_END
|
||||
DRI_CONF_SECTION_MISCELLANEOUS
|
||||
DRI_CONF_ALWAYS_HAVE_DEPTH_BUFFER("false")
|
||||
DRI_CONF_GLSL_ZERO_INIT("false")
|
||||
- DRI_CONF_ALLOW_RGB10_CONFIGS("true")
|
||||
+ DRI_CONF_ALLOW_RGB10_CONFIGS("false")
|
||||
DRI_CONF_SECTION_END
|
||||
--
|
||||
2.17.0
|
||||
|
|
@ -1,36 +0,0 @@
|
|||
diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
index 5ec1df6..a0406fc 100644
|
||||
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
|
||||
@@ -306,6 +306,13 @@ llvmpipe_is_format_supported( struct pipe_screen *_screen,
|
||||
if (!format_desc)
|
||||
return FALSE;
|
||||
|
||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
||||
+ util_format_is_float(format)) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
assert(target == PIPE_BUFFER ||
|
||||
target == PIPE_TEXTURE_1D ||
|
||||
target == PIPE_TEXTURE_1D_ARRAY ||
|
||||
diff --git a/src/gallium/drivers/softpipe/sp_screen.c b/src/gallium/drivers/softpipe/sp_screen.c
|
||||
index 937035e..2f5e571 100644
|
||||
--- a/src/gallium/drivers/softpipe/sp_screen.c
|
||||
+++ b/src/gallium/drivers/softpipe/sp_screen.c
|
||||
@@ -291,6 +291,13 @@ softpipe_is_format_supported( struct pipe_screen *screen,
|
||||
if (!format_desc)
|
||||
return FALSE;
|
||||
|
||||
+ if ((bind & PIPE_BIND_RENDER_TARGET) &&
|
||||
+ format != PIPE_FORMAT_R9G9B9E5_FLOAT &&
|
||||
+ format != PIPE_FORMAT_R11G11B10_FLOAT &&
|
||||
+ util_format_is_float(format)) {
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
if (sample_count > 1)
|
||||
return FALSE;
|
||||
|
27
mesa.spec
27
mesa.spec
|
@ -8,7 +8,7 @@
|
|||
%bcond_with opencl
|
||||
%bcond_without osmesa
|
||||
%bcond_without osmesa_gallium
|
||||
%bcond_with va
|
||||
%bcond_without va
|
||||
%bcond_without vdpau
|
||||
%bcond_without wayland
|
||||
%{?build_selinux}%{?!build_selinux:%bcond_with selinux}
|
||||
|
@ -31,8 +31,8 @@
|
|||
|
||||
Summary: OpenGL-compatible 3D graphics library
|
||||
Name: mesa
|
||||
Version: 18.3.6
|
||||
Release: 8
|
||||
Version: 19.2.1
|
||||
Release: 2
|
||||
License: MIT
|
||||
Group: System/Libraries
|
||||
Url: http://www.mesa3d.org
|
||||
|
@ -41,10 +41,9 @@ Source1: https://mesa.freedesktop.org/archive/mesa-%{version}.tar.xz.sig
|
|||
Source3: make-git-snapshot.sh
|
||||
Source101: mesa.rpmlintrc
|
||||
|
||||
Patch1: mesa-9.2-hardware-float.patch
|
||||
Patch1: 0001-gallium-Disable-rgb10-configs-by-default.patch
|
||||
Patch2: mesa-11.2-evergreen-big-endian.patch
|
||||
|
||||
BuildRequires: llvm-devel
|
||||
BuildRequires: meson >= 0.48.0
|
||||
BuildRequires: intltool
|
||||
BuildRequires: itstool
|
||||
|
@ -58,7 +57,7 @@ BuildRequires: pkgconfig(libomxil-bellagio)
|
|||
BuildRequires: makedepend
|
||||
BuildRequires: python3-mako
|
||||
BuildRequires: pkgconfig(expat)
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.95
|
||||
BuildRequires: pkgconfig(libdrm) >= 2.4.99
|
||||
BuildRequires: pkgconfig(libunwind)
|
||||
BuildRequires: pkgconfig(python3)
|
||||
%if %{with va}
|
||||
|
@ -70,8 +69,8 @@ BuildRequires: pkgconfig(vdpau)
|
|||
%endif
|
||||
%if %{with opencl}
|
||||
BuildRequires: gcc >= 5.3
|
||||
BuildRequires: clang >= 6.0.0
|
||||
BuildRequires: clang-devel >= 6.0.0
|
||||
BuildRequires: clang >= 7.0.0
|
||||
BuildRequires: clang-devel >= 7.0.0
|
||||
BuildRequires: opencl-headers >= 2.1
|
||||
BuildRequires: pkgconfig(OpenCL) >= 2.1
|
||||
%endif
|
||||
|
@ -88,7 +87,8 @@ BuildRequires: pkgconfig(xmu)
|
|||
BuildRequires: pkgconfig(xproto)
|
||||
BuildRequires: pkgconfig(xrandr)
|
||||
BuildRequires: pkgconfig(xt)
|
||||
BuildRequires: pkgconfig(xvmc)
|
||||
BuildRequires: pkgconfig(xv)
|
||||
BuildRequires: pkgconfig(xvmc) >= 1.0.12
|
||||
BuildRequires: pkgconfig(xxf86vm)
|
||||
# Needed to build with support for DRI2 and DRI3 X11 extensions.
|
||||
BuildRequires: pkgconfig(dri2proto)
|
||||
|
@ -114,9 +114,6 @@ contains no libraries but rather the common files.
|
|||
|
||||
%files
|
||||
%doc docs/README.*
|
||||
# This file will be included to mesa package automatically
|
||||
# due to being located in %{_defaultdocdir}/%{name}:
|
||||
#%{_defaultdocdir}/mesa/00-mesa-defaults_%{_arch}.conf.sample
|
||||
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
|
@ -151,7 +148,7 @@ Group. It has been adopted by Intel, AMD, Nvidia, and ARM Holdings.
|
|||
|
||||
%endif
|
||||
|
||||
#-----------------------------------------------------------------------------
|
||||
#----------------------------------------------------------------------------
|
||||
|
||||
%define dridrivers %mklibname dri-drivers
|
||||
|
||||
|
@ -707,7 +704,7 @@ Mesa common meta package for development files.
|
|||
-Dgallium-vdpau=true \
|
||||
-Dgallium-xvmc=true \
|
||||
-Dgallium-omx=bellagio \
|
||||
-Dgallium-va=false \
|
||||
-Dgallium-va=true \
|
||||
-Dgallium-xa=true \
|
||||
-Dgallium-nine=true \
|
||||
-Dgallium-opencl=disabled \
|
||||
|
@ -734,7 +731,7 @@ for l in ../libGL.so.*; do cp -a $l .; done
|
|||
popd
|
||||
|
||||
%ifarch %{x86_64}
|
||||
mkdir -p %{buildroot}%{_prefix}/lib/dri
|
||||
mkdir -p %{buildroot}%{_libdir}/dri
|
||||
%endif
|
||||
|
||||
rm -f %{buildroot}/%{_includedir}/GL/glut.h
|
||||
|
|
Loading…
Add table
Reference in a new issue