pool/Mesa
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
OBS User unknown 2008-04-20 18:35:26 +00:00 committed by Git OBS Bridge
parent 6b186d6e3e
commit 8eed6ac677
5 changed files with 112 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Mesa.changes
View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Apr 14 23:56:57 CEST 2008 - sndirsch@suse.de
- unichrome-context.diff
* Do not clear the current context before attempting to use it.
(bnc #285496)
- no longer need to use LIBGL_ALWAYS_INDIRECT=1 on via hardware
(bnc #285496)
-------------------------------------------------------------------
Thu Apr 10 12:54:45 CEST 2008 - ro@suse.de

23
Mesa.spec
View File

@ -20,20 +20,19 @@ Provides: xorg-x11-Mesa
Obsoletes: xorg-x11-Mesa
AutoReqProv: on
Version: 7.0.3
Release: 23
Release: 25
Summary: Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL
Source: MesaLib-%{version}.tar.bz2
Source1: MesaDemos-%{version}.tar.bz2
Source3: README.updates
Source4: manual-pages.tar.bz2
Source5: via.csh
Source6: via.sh
Patch0: disable-sis_dri.diff
Patch1: dri_driver_dir.diff
Patch2: i915-crossbar.diff
Patch4: libIndirectGL.diff
Patch5: static.diff
Patch6: link-shared.diff
Patch7: unichrome-context.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
@ -123,6 +122,7 @@ rm -rf src/glw/
%ifarch %ix86 x86_64 ppc
%patch6
%endif
%patch7 -p1
%build
@ -201,12 +201,6 @@ mkdir -p $RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
install -m 644 $RPM_SOURCE_DIR/README.updates \
$RPM_BUILD_ROOT/usr/%{_lib}/dri/updates
%endif
%if %suse_version > 1010
%ifnarch s390 s390x ppc64
mkdir -p $RPM_BUILD_ROOT/etc/profile.d
install -m 644 $RPM_SOURCE_DIR/via.{sh,csh} $RPM_BUILD_ROOT/etc/profile.d
%endif
%endif
%clean
rm -rf $RPM_BUILD_ROOT
@ -218,11 +212,6 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root)
%doc docs/README* docs/COPYING
%if %suse_version > 1010
%ifnarch s390 s390x ppc64
/etc/profile.d/via.*
%endif
%endif
/usr/include/GL/gl.h
/usr/include/GL/glext.h
/usr/include/GL/glx.h
@ -271,6 +260,12 @@ rm -rf $RPM_BUILD_ROOT
/usr/%{_lib}/libMesaGL.a
%changelog
* Tue Apr 15 2008 sndirsch@suse.de
- unichrome-context.diff
* Do not clear the current context before attempting to use it.
(bnc #285496)
- no longer need to use LIBGL_ALWAYS_INDIRECT=1 on via hardware
(bnc #285496)
* Thu Apr 10 2008 ro@suse.de
- added baselibs.conf file to build xxbit packages
for multilib support

94
unichrome-context.diff Normal file
View File

@ -0,0 +1,94 @@
From c75a717af6aee750f673ff1809faf69e8fe2527a Mon Sep 17 00:00:00 2001
From: Luc Verhaegen <libv@skynet.be>
Date: Mon, 14 Apr 2008 22:51:36 +0200
Subject: [PATCH] unichrome: Do not clear the current context before attempting to use it.
Beautified from Gabriel Mansi's (gabriel.mansi@gmail.com) original patch,
available from http://rudin.suse.de:8888/attachment.cgi?id=181709
---
src/mesa/drivers/dri/unichrome/via_context.c | 56 +++++++++++++------------
1 files changed, 29 insertions(+), 27 deletions(-)
diff --git a/src/mesa/drivers/dri/unichrome/via_context.c b/src/mesa/drivers/dri/unichrome/via_context.c
index 1d5b1e0..d489d80 100644
--- a/src/mesa/drivers/dri/unichrome/via_context.c
+++ b/src/mesa/drivers/dri/unichrome/via_context.c
@@ -686,46 +686,48 @@ void
viaDestroyContext(__DRIcontextPrivate *driContextPriv)
{
GET_CURRENT_CONTEXT(ctx);
- struct via_context *vmesa =
+ struct via_context *vmesa =
(struct via_context *)driContextPriv->driverPrivate;
struct via_context *current = ctx ? VIA_CONTEXT(ctx) : NULL;
+
assert(vmesa); /* should never be null */
+ if (vmesa->driDrawable) {
+ viaWaitIdle(vmesa, GL_FALSE);
+
+ if (vmesa->doPageFlip) {
+ LOCK_HARDWARE(vmesa);
+ if (vmesa->pfCurrentOffset != 0) {
+ fprintf(stderr, "%s - reset pf\n", __FUNCTION__);
+ viaResetPageFlippingLocked(vmesa);
+ }
+ UNLOCK_HARDWARE(vmesa);
+ }
+ }
+
/* check if we're deleting the currently bound context */
if (vmesa == current) {
VIA_FLUSH_DMA(vmesa);
_mesa_make_current(NULL, NULL, NULL);
}
- if (vmesa) {
- viaWaitIdle(vmesa, GL_FALSE);
- if (vmesa->doPageFlip) {
- LOCK_HARDWARE(vmesa);
- if (vmesa->pfCurrentOffset != 0) {
- fprintf(stderr, "%s - reset pf\n", __FUNCTION__);
- viaResetPageFlippingLocked(vmesa);
- }
- UNLOCK_HARDWARE(vmesa);
- }
-
- _swsetup_DestroyContext(vmesa->glCtx);
- _tnl_DestroyContext(vmesa->glCtx);
- _vbo_DestroyContext(vmesa->glCtx);
- _swrast_DestroyContext(vmesa->glCtx);
- /* free the Mesa context */
- _mesa_destroy_context(vmesa->glCtx);
- /* release our data */
- FreeBuffer(vmesa);
+ _swsetup_DestroyContext(vmesa->glCtx);
+ _tnl_DestroyContext(vmesa->glCtx);
+ _vbo_DestroyContext(vmesa->glCtx);
+ _swrast_DestroyContext(vmesa->glCtx);
+ /* free the Mesa context */
+ _mesa_destroy_context(vmesa->glCtx);
+ /* release our data */
+ FreeBuffer(vmesa);
- assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_AGP]));
- assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_VIDEO]));
- assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_SYSTEM]));
- assert (is_empty_list(&vmesa->freed_tex_buffers));
+ assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_AGP]));
+ assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_VIDEO]));
+ assert (is_empty_list(&vmesa->tex_image_list[VIA_MEM_SYSTEM]));
+ assert (is_empty_list(&vmesa->freed_tex_buffers));
- driDestroyOptionCache(&vmesa->optionCache);
+ driDestroyOptionCache(&vmesa->optionCache);
- FREE(vmesa);
- }
+ FREE(vmesa);
}
--
1.4.3.4

6
via.csh
View File

@ -1,6 +0,0 @@
if ( -r /var/log/Xorg.0.log ) then
grep -q \"via\" /var/log/Xorg.0.log
if ( $? == 0 ) then
setenv LIBGL_ALWAYS_INDIRECT 1
endif
endif

6
via.sh
View File

@ -1,6 +0,0 @@
if [ -r /var/log/Xorg.0.log ]; then
grep -q \"via\" /var/log/Xorg.0.log
if [ $? -eq 0 ]; then
export LIBGL_ALWAYS_INDIRECT=1
fi
fi