rpm/Mesa
SHA256
1
0
Fork 0
forked from pool/Mesa
Code Pull Requests Activity

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/Mesa?expand=0&rev=67

Browse Source
This commit is contained in:
OBS User unknown 2009-07-23 13:42:05 +00:00 committed by Git OBS Bridge
parent 61897eab75
commit 7a565d0d5e
9 changed files with 33 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Mesa.changes
View File

@ -1,3 +1,14 @@
-------------------------------------------------------------------
Sat Jul 18 04:16:04 CEST 2009 - sndirsch@suse.de
- Mesa 7.5
* new features like e.g. Gallium3D
* various bug fixes
* removed some GL_SGIX_* extensions, which have been superseded
by ARB versions
- obsoletes mesa-commit-88b702e.diff, mesa-commit-954dfba.diff,
intel_release_static_region.patch
-------------------------------------------------------------------
Wed Jun 24 04:43:35 CEST 2009 - sndirsch@suse.de

31
Mesa.spec
View File

@ -1,5 +1,5 @@
#
# spec file for package Mesa (Version 7.4.4)
# spec file for package Mesa (Version 7.5)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@ -32,7 +32,7 @@ Obsoletes: XFree86-Mesa-64bit
Obsoletes: Mesa-64bit
%endif
#
Version: 7.4.4
Version: 7.5
Release: 1
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
Source: MesaLib-%{version}.tar.bz2
@ -43,9 +43,6 @@ Source5: drirc
Patch1: dri_driver_dir.diff
Patch6: link-shared.diff
Patch7: disable_gem_warning.diff
Patch9: mesa-commit-954dfba.diff
Patch10: mesa-commit-88b702e.diff
Patch14: intel_release_static_region.patch
Patch15: Mesa_indirect_old_xserver_compatibility.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -119,9 +116,6 @@ sed -i 's/REPLACE/%_lib/g' src/glx/x11/Makefile
### FIXME
#%patch6
%patch7 -p1
%patch9 -p1
%patch10 -p1
%patch14 -p1
%patch15 -p1
%build
@ -131,14 +125,19 @@ rm src/mesa/depend
autoreconf -fi
### libGL (disable savage/mga, bnc #402132/#403071)
%configure --disable-glw \
--with-driver=dri \
%ifarch %ix86 x86_64 ppc
--with-dri-drivers=i915,i965,mach64,r128,r200,r300,radeon,tdfx,unichrome,swrast \
--with-driver=dri \
%ifarch %ix86 x86_64
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,radeon,s3v,sis,tdfx,trident,unichrome,ffb,swrast \
--enable-gallium-nouveau \
%endif
%ifarch ppc
--with-dri-drivers=i810,i915,i965,mach64,r128,r200,r300,radeon,s3v,tdfx,trident,unichrome,ffb,swrast \
%endif
%ifarch s390 s390x
--with-dri-drivers=swrast \
%endif
--disable-glut
make -C src/gallium/state_trackers/dri
gmake
make install DESTDIR=$RPM_BUILD_ROOT
# build and install Indirect Rendering only libGL
@ -146,11 +145,12 @@ make realclean
%configure --with-driver=xlib \
--disable-glu \
--disable-glw \
--disable-glut
--disable-glut \
--disable-gallium
sed -i 's/GL_LIB = .*/GL_LIB = IndirectGL/g' configs/autoconf
gmake
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/usr/%{_lib}/libIndirectGL.so
cp -a %{_lib}/libIndirectGL.so.* %{_lib}/libOSMesa.so* \
$RPM_BUILD_ROOT/usr/%{_lib}
for dir in ../xc/doc/man/{GL/gl,GL/glx,GLU}; do
pushd $dir
xmkmf -a
@ -202,12 +202,13 @@ rm -rf $RPM_BUILD_ROOT
/usr/include/GL/vms_x_fix.h
/usr/include/GL/wmesa.h
/usr/include/GL/internal/dri_interface.h
/usr/include/GL/wglext.h
/usr/%{_lib}/libGLU.so
/usr/%{_lib}/libOSMesa.so
/usr/%{_lib}/libEGL.so
/usr/%{_lib}/pkgconfig/dri.pc
/usr/%{_lib}/pkgconfig/gl.pc
/usr/%{_lib}/pkgconfig/glu.pc
/usr/%{_lib}/pkgconfig/osmesa.pc
%{_mandir}/man3/*
%changelog

3
MesaDemos-7.4.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:99d93b3bf3d15aa71d8f6036dc07222da32a37b437c0c02170633676a7dc7014
size 1382960

3
MesaDemos-7.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:df1e90b213f3f27f5b1f4a8ae0e72429793c54d43ba8348b3f0a249ec0152540
size 1389210

3
MesaLib-7.4.4.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:f0a7120656e9b25c449e9f043e6b14baf9236b935a438cffc9759aaa47270f25
size 3448039

3
MesaLib-7.5.tar.bz2 Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4104def2c5b9b13e609f6573dbe09b5c0031d86e73192edf59fec71d5b0d1dcf
size 4512078

51
intel_release_static_region.patch
View File

@ -1,51 +0,0 @@
diff --git a/src/mesa/drivers/dri/intel/intel_context.c b/src/mesa/drivers/dri/intel/intel_context.c
index 3601eca..3a56595 100644
--- a/src/mesa/drivers/dri/intel/intel_context.c
+++ b/src/mesa/drivers/dri/intel/intel_context.c
@@ -674,6 +674,31 @@ intelDestroyContext(__DRIcontextPrivate * driContextPriv)
fprintf(stderr, "do something to free texture heaps\n");
}
+ if (!driContextPriv->driScreenPriv->dri2.enabled && intel->driDrawable) {
+ struct intel_framebuffer *intel_fb =
+ (struct intel_framebuffer *) intel->driDrawable->driverPrivate;
+ struct intel_renderbuffer *irbDepth =
+ intel_get_renderbuffer(&intel_fb->Base, BUFFER_DEPTH);
+ struct intel_renderbuffer *irbStencil =
+ intel_get_renderbuffer(&intel_fb->Base, BUFFER_STENCIL);
+
+ if (intel_fb->color_rb[0]) {
+ intel_renderbuffer_set_region(intel_fb->color_rb[0], NULL);
+ }
+
+ if (intel_fb->color_rb[1]) {
+ intel_renderbuffer_set_region(intel_fb->color_rb[1], NULL);
+ }
+
+ if (irbDepth) {
+ intel_renderbuffer_set_region(irbDepth, NULL);
+ }
+
+ if (irbStencil) {
+ intel_renderbuffer_set_region(irbStencil, NULL);
+ }
+ }
+
intel_region_release(&intel->front_region);
intel_region_release(&intel->back_region);
intel_region_release(&intel->third_region);
diff --git a/src/mesa/drivers/dri/intel/intel_regions.c b/src/mesa/drivers/dri/intel/intel_regions.c
index bbbaf3e..2eb393a 100644
--- a/src/mesa/drivers/dri/intel/intel_regions.c
+++ b/src/mesa/drivers/dri/intel/intel_regions.c
@@ -166,8 +166,9 @@ intel_region_reference(struct intel_region **dst, struct intel_region *src)
assert(*dst == NULL);
if (src) {
src->refcount++;
- *dst = src;
}
+
+ *dst = src;
}
void

50
mesa-commit-88b702e.diff
View File

@ -1,50 +0,0 @@
commit 88b702e8c47c8930940c396132b2a191d4a3e7ca
Author: Robert Ellison <papillo@i965-laptop.(none)>
Date: Fri Feb 13 15:19:04 2009 -0700
i965: Eric Anholt's patch for bumping up texture sizes
I'm committing this because it fixes a conform failure; the failure occurs
on the TextureProxy test, where the test attempts to create proxy textures
at every level, but fails at the last level (border == 1, width == 1,
height == 1) because it's beyond MAX_TEXTURE_LEVELS.
Eric's original comment was:
idr said that in his review swrast was ready for it, and the 965 driver is
advertising it already though it has been resulting in many crashes due to
arrays using these defines not being big enough.
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index c3feffd..9d0cd18 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -101,16 +101,16 @@
#define MAX_COLOR_TABLE_SIZE 256
/** Number of 1D/2D texture mipmap levels */
-#define MAX_TEXTURE_LEVELS 12
+#define MAX_TEXTURE_LEVELS 13
/** Number of 3D texture mipmap levels */
#define MAX_3D_TEXTURE_LEVELS 9
/** Number of cube texture mipmap levels - GL_ARB_texture_cube_map */
-#define MAX_CUBE_TEXTURE_LEVELS 12
+#define MAX_CUBE_TEXTURE_LEVELS 13
/** Maximum rectangular texture size - GL_NV_texture_rectangle */
-#define MAX_TEXTURE_RECT_SIZE 2048
+#define MAX_TEXTURE_RECT_SIZE 4096
/** Maximum number of layers in a 1D or 2D array texture - GL_MESA_texture_array */
#define MAX_ARRAY_TEXTURE_LAYERS 64
@@ -166,7 +166,7 @@
#define MAX_TEXTURE_MAX_ANISOTROPY 16.0
/** For GL_EXT_texture_lod_bias (typically MAX_TEXTURE_LEVELS - 1) */
-#define MAX_TEXTURE_LOD_BIAS 11.0
+#define MAX_TEXTURE_LOD_BIAS 12.0
/** For GL_ARB_vertex_program */
/*@{*/

33
mesa-commit-954dfba.diff
View File

@ -1,33 +0,0 @@
commit 954dfba12986f578f2d8461818f9e9ac1f8f2b41
Author: Keith Packard <keithp@keithp.com>
Date: Fri Jan 30 21:51:32 2009 -0800
i965: bump texture limit to 4kx4k
Rendering and textures are limited to 8kx8k, but mesa limits things to
4kx4k, and magic guard band stuff may break on 8kx8k drawing. This is safe
though, and makes compiz work on bigger screens.
Signed-off-by: Keith Packard <keithp@keithp.com>
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index d7a2bd9..d66781f 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -135,13 +135,12 @@ GLboolean brwCreateContext( const __GLcontextModes *mesaVis,
ctx->Const.MaxTextureImageUnits);
ctx->Const.MaxVertexTextureImageUnits = 0; /* no vertex shader textures */
- /* Advertise the full hardware capabilities. The new memory
- * manager should cope much better with overload situations:
+ /* Mesa limits textures to 4kx4k; it would be nice to fix that someday
*/
- ctx->Const.MaxTextureLevels = 12;
+ ctx->Const.MaxTextureLevels = 13;
ctx->Const.Max3DTextureLevels = 9;
ctx->Const.MaxCubeTextureLevels = 12;
- ctx->Const.MaxTextureRectSize = (1<<11);
+ ctx->Const.MaxTextureRectSize = (1<<12);
/* if conformance mode is set, swrast can handle any size AA point */
ctx->Const.MaxPointSizeAA = 255.0;