rpms
/
mesa
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Mesa 9.1

This commit is contained in:
Adam Jackson 2013-03-11 18:56:49 -04:00
parent 2a4ddba5e6
commit 3515ea2491
4 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -45,3 +45,4 @@ mesa-20100720.tar.bz2
/MesaLib-9.0.tar.bz2 /MesaLib-9.0.tar.bz2
/MesaLib-9.0.1.tar.bz2 /MesaLib-9.0.1.tar.bz2
/mesa-20130213.tar.xz /mesa-20130213.tar.xz
/MesaLib-9.1.tar.bz2

26
intel-revert-gl3.patch
View File

@ -1,8 +1,7 @@
diff --git a/src/mesa/drivers/dri/intel/intel_extensions.c b/src/mesa/drivers/dri/intel/intel_extensions.c diff -up Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c.jx Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c
index 4e7b5da..1562f59 100755 --- Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c.jx 2013-02-22 20:45:52.000000000 -0500
--- a/src/mesa/drivers/dri/intel/intel_extensions.c +++ Mesa-9.1/src/mesa/drivers/dri/intel/intel_extensions.c 2013-03-11 17:39:07.069991819 -0400
+++ b/src/mesa/drivers/dri/intel/intel_extensions.c @@ -137,9 +137,11 @@ intelInitExtensions(struct gl_context *c
@@ -135,9 +135,11 @@ intelInitExtensions(struct gl_context *ctx)
ctx->Extensions.ARB_seamless_cube_map = true; ctx->Extensions.ARB_seamless_cube_map = true;
ctx->Extensions.ARB_shader_bit_encoding = true; ctx->Extensions.ARB_shader_bit_encoding = true;
ctx->Extensions.ARB_shader_texture_lod = true; ctx->Extensions.ARB_shader_texture_lod = true;
@ -13,12 +12,11 @@ index 4e7b5da..1562f59 100755
+#endif +#endif
ctx->Extensions.ARB_texture_compression_rgtc = true; ctx->Extensions.ARB_texture_compression_rgtc = true;
ctx->Extensions.ARB_texture_rg = true; ctx->Extensions.ARB_texture_rg = true;
ctx->Extensions.ARB_vertex_type_2_10_10_10_rev = true; ctx->Extensions.ARB_texture_rgb10_a2ui = true;
diff --git a/src/mesa/drivers/dri/intel/intel_screen.c b/src/mesa/drivers/dri/intel/intel_screen.c diff -up Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c.jx Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c
index 750cb78..c0b63d3 100644 --- Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c.jx 2013-02-22 20:46:23.000000000 -0500
--- a/src/mesa/drivers/dri/intel/intel_screen.c +++ Mesa-9.1/src/mesa/drivers/dri/intel/intel_screen.c 2013-03-11 17:40:31.235111004 -0400
+++ b/src/mesa/drivers/dri/intel/intel_screen.c @@ -1038,9 +1038,15 @@ intel_screen_make_configs(__DRIscreen *d
@@ -1039,9 +1039,15 @@ intel_screen_make_configs(__DRIscreen *dri_screen)
static void static void
set_max_gl_versions(struct intel_screen *screen) set_max_gl_versions(struct intel_screen *screen)
{ {
@ -35,19 +33,19 @@ index 750cb78..c0b63d3 100644
screen->max_gl_core_version = 31; screen->max_gl_core_version = 31;
screen->max_gl_compat_version = 30; screen->max_gl_compat_version = 30;
screen->max_gl_es1_version = 11; screen->max_gl_es1_version = 11;
@@ -1054,10 +1060,17 @@ set_max_gl_versions(struct intel_screen *screen) @@ -1053,10 +1059,17 @@ set_max_gl_versions(struct intel_screen
} }
break; break;
case 6: case 6:
- screen->max_gl_core_version = 31; - screen->max_gl_core_version = 31;
- screen->max_gl_compat_version = 30; - screen->max_gl_compat_version = 30;
- screen->max_gl_es1_version = 11; - screen->max_gl_es1_version = 11;
- screen->max_gl_es2_version = 20; - screen->max_gl_es2_version = 30;
+ if (has_texture_float) { + if (has_texture_float) {
+ screen->max_gl_core_version = 31; + screen->max_gl_core_version = 31;
+ screen->max_gl_compat_version = 30; + screen->max_gl_compat_version = 30;
+ screen->max_gl_es1_version = 11; + screen->max_gl_es1_version = 11;
+ screen->max_gl_es2_version = 20; + screen->max_gl_es2_version = 30;
+ } else { + } else {
+ screen->max_gl_core_version = 0; + screen->max_gl_core_version = 0;
+ screen->max_gl_compat_version = 21; + screen->max_gl_compat_version = 21;

16
mesa.spec
View File

@ -43,21 +43,20 @@
%define _default_patch_fuzz 2 %define _default_patch_fuzz 2
%define gitdate 20130213 #define gitdate 20130213
#% define snapshot #% define snapshot
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
Name: mesa Name: mesa
Version: 9.1 Version: 9.1
Release: 0.4%{?dist} Release: 1%{?dist}
License: MIT License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
#Source0: http://downloads.sf.net/mesa3d/MesaLib-%{version}.tar.bz2
#Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2 #Source0: http://www.mesa3d.org/beta/MesaLib-%{version}%{?snapshot}.tar.bz2
#Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2 Source0: ftp://ftp.freedesktop.org/pub/%{name}/%{version}/MesaLib-%{version}.tar.bz2
Source0: %{name}-%{gitdate}.tar.xz #Source0: %{name}-%{gitdate}.tar.xz
Source3: make-git-snapshot.sh Source3: make-git-snapshot.sh
# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
@ -280,8 +279,8 @@ Group: System Environment/Libraries
Mesa shared glapi Mesa shared glapi
%prep %prep
#%setup -q -n Mesa-%{version}%{?snapshot} %setup -q -n Mesa-%{version}%{?snapshot}
%setup -q -n mesa-%{gitdate} #setup -q -n mesa-%{gitdate}
%patch0 -p1 -b .nv50rtti %patch0 -p1 -b .nv50rtti
%patch1 -p1 -b .nogl3 %patch1 -p1 -b .nogl3
#%patch11 -p1 -b .nouveau #%patch11 -p1 -b .nouveau
@ -590,6 +589,9 @@ rm -rf $RPM_BUILD_ROOT
%endif %endif
%changelog %changelog
* Fri Mar 08 2013 Adam Jackson <ajax@redhat.com> 9.1-1
- Mesa 9.1
* Wed Feb 27 2013 Dan Horák <dan[at]danny.cz> - 9.1-0.4 * Wed Feb 27 2013 Dan Horák <dan[at]danny.cz> - 9.1-0.4
- /etc/drirc is always created, so exclude it on platforms without hw drivers - /etc/drirc is always created, so exclude it on platforms without hw drivers

2
sources
View File

@ -1 +1 @@
e06a31b73be406581f3539809f4aa7ec mesa-20130213.tar.xz d3891e02215422e120271d976ff1947e MesaLib-9.1.tar.bz2