Hello community, here is the log from the commit of package xf86-video-mach64 for openSUSE:Factory checked in at 2018-05-29 10:33:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xf86-video-mach64 (Old) and /work/SRC/openSUSE:Factory/.xf86-video-mach64.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-mach64" Tue May 29 10:33:02 2018 rev:13 rq:610634 version:6.9.6 Changes: -------- --- /work/SRC/openSUSE:Factory/xf86-video-mach64/xf86-video-mach64.changes 2015-05-06 07:49:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xf86-video-mach64.new/xf86-video-mach64.changes 2018-05-29 10:33:05.710684935 +0200 @@ -1,0 +2,6 @@ +Sat May 19 15:19:57 UTC 2018 - sndir...@suse.com + +- Update to version 6.9.6 + * A boring release, fixing source compatibility with xserver 1.20. + +------------------------------------------------------------------- Old: ---- xf86-video-mach64-6.9.5.tar.bz2 New: ---- xf86-video-mach64-6.9.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xf86-video-mach64.spec ++++++ --- /var/tmp/diff_new_pack.4r1teb/_old 2018-05-29 10:33:06.210666469 +0200 +++ /var/tmp/diff_new_pack.4r1teb/_new 2018-05-29 10:33:06.214666321 +0200 @@ -1,7 +1,7 @@ # # spec file for package xf86-video-mach64 # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: xf86-video-mach64 -Version: 6.9.5 +Version: 6.9.6 Release: 0 Summary: ATI Mach64 series video driver for the Xorg X server License: MIT ++++++ xf86-video-mach64-6.9.5.tar.bz2 -> xf86-video-mach64-6.9.6.tar.bz2 ++++++ ++++ 22227 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/ChangeLog new/xf86-video-mach64-6.9.6/ChangeLog --- old/xf86-video-mach64-6.9.5/ChangeLog 2015-05-04 21:58:15.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/ChangeLog 2018-05-18 18:51:52.000000000 +0200 @@ -1,3 +1,94 @@ +commit a504b15fc74f7725f67866e22407b742d1d435a9 +Author: Adam Jackson <a...@redhat.com> +Date: Fri May 18 12:49:30 2018 -0400 + + mach64 6.9.6 + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit eab6848f85d26c824f8096949105bf4894a1d48d +Author: Emil Velikov <emil.veli...@collabora.com> +Date: Mon Jul 17 13:44:55 2017 +0100 + + xf86-video-mach64: remove the GlxSetVisualConfigs stub and friends + + The function was an empty since 2008 at least. Remove it alongside the + unused GLX visuals code. + + With this all the GL/GLX dependencies in the driver are gone. + + Cc: Adam Jackson <a...@redhat.com> + Cc: Connor Behan <connor.be...@gmail.com> + Signed-off-by: Emil Velikov <emil.veli...@collabora.com> + +commit 5ae03dc9f4564de54df6427ed7e6e80e75a4179e +Author: Adam Jackson <a...@redhat.com> +Date: Thu Feb 16 11:18:10 2017 -0500 + + D'oh, fix the previous commit + + These limits are against mode->[HV]Total, not Display. + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit e27785a3fbabc9f354c361b5058b0359b6d9b5ae +Author: Adam Jackson <a...@redhat.com> +Date: Thu Feb 16 11:13:59 2017 -0500 + + Move max mode h/v checks into ATIValidMode + + Signed-off-by: Adam Jackson <a...@redhat.com> + +commit dec6d18b61a1f8841303572ae5931fe6c937664f +Author: Mihail Konev <k....@ya.ru> +Date: Thu Jan 26 14:00:22 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <k....@ya.ru> + +commit e67dab498fc7b6b4c73b5c33c550ecfcb814b4b1 +Author: Emil Velikov <emil.l.veli...@gmail.com> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <emil.l.veli...@gmail.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 2707a8ea311a2d40e0db8161225241bc360ab61d +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Emil Velikov <emil.veli...@collabora.com> + +commit 811890e401299f5a80e237fbaa216c9242654119 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 1 21:03:14 2014 -0700 + + autogen.sh: Honor NOCONFIGURE=1 + + See http://people.gnome.org/~walters/docs/build-api.txt + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit de20547a7c31cf576d9b5b9ac607a1bde93542b8 +Author: Alan Coopersmith <alan.coopersm...@oracle.com> +Date: Sun Jun 1 21:03:13 2014 -0700 + + configure: Drop AM_MAINTAINER_MODE + + Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com> + commit 8f920350a736012ce2a7469d8252f5f5bf72cef3 Author: Adam Jackson <a...@redhat.com> Date: Mon May 4 15:50:09 2015 -0400 @@ -601,11 +692,11 @@ Fixes these warnings from parfait source checker: Error: Read buffer overflow at src/atimach64render.c:601 - in function 'Mach64PrepareTexture' [Symbolic analysis] + in function 'Mach64PrepareTexture' [Symbolic analysis] In array dereference of Mach64TexFormats[i] with index 'i' Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 Error: Read buffer overflow at src/atimach64render.c:712 - in function 'Mach64PrepareComposite' [Symbolic analysis] + in function 'Mach64PrepareComposite' [Symbolic analysis] In array dereference of Mach64TexFormats[i] with index 'i' Array size is 6 elements (of 12 bytes each), index >= 0 and index <= 6 @@ -816,7 +907,7 @@ Conflicts: - src/radeon_commonfuncs.c + src/radeon_commonfuncs.c commit 27ddb39b12a0b54e099fd5274c4c91f08e2d2822 Author: Alex Deucher <alex@samba.(none)> @@ -1902,8 +1993,8 @@ Conflicts: - src/radeon_display.c - src/radeon_driver.c + src/radeon_display.c + src/radeon_driver.c commit eb99c3c5c9a2249cb84920f0f225e525fc3a4144 Author: Alex Deucher <alex@botch2.(none)> @@ -2283,10 +2374,10 @@ Conflicts: - src/radeon.h - src/radeon_crtc.c - src/radeon_driver.c - src/radeon_output.c + src/radeon.h + src/radeon_crtc.c + src/radeon_driver.c + src/radeon_output.c commit 6451ea2dcc4fac762442f699935864f4a8d445f7 Merge: 0d89556 5896ca4 @@ -2357,7 +2448,7 @@ Conflicts: - src/radeon_output.c + src/radeon_output.c commit 21ed435398e4a398dd8a0a5d7c1d4cc45e916332 Author: Alex Deucher <a...@t41p.hsd1.va.comcast.net> @@ -2864,9 +2955,9 @@ Conflicts: - src/radeon_chipset.h - src/radeon_driver.c - src/radeon_probe.c + src/radeon_chipset.h + src/radeon_driver.c + src/radeon_probe.c commit 0d1e0c7805b3d8e56ccb49465e6b144afb7bdc51 Author: Dave Airlie <airl...@redhat.com> @@ -2889,8 +2980,8 @@ Conflicts: - src/radeon_cursor.c - src/radeon_output.c + src/radeon_cursor.c + src/radeon_output.c commit 744c8cb6c293fcaa687566f52901644e699baace Merge: e258fbe e530af7 @@ -4101,7 +4192,7 @@ Conflicts: - src/ati.c + src/ati.c commit 673f799729824f4439dd5f681f75dd5aab50947f Author: Alex Deucher <alex@botch2.(none)> @@ -4372,14 +4463,14 @@ Conflicts: - src/radeon.h - src/radeon_bios.c - src/radeon_display.c - src/radeon_dri.c - src/radeon_driver.c - src/radeon_modes.c - src/radeon_probe.h - src/radeon_video.c + src/radeon.h + src/radeon_bios.c + src/radeon_display.c + src/radeon_dri.c + src/radeon_driver.c + src/radeon_modes.c + src/radeon_probe.h + src/radeon_video.c commit 53a67e31904bec9a3aa1bd24de8034dcafea1d2a Author: Alex Deucher <a...@t41p.hsd1.va.comcast.net> @@ -5245,9 +5336,9 @@ Conflicts: - src/radeon_cursor.c - src/radeon_display.c - src/radeon_driver.c + src/radeon_cursor.c + src/radeon_display.c + src/radeon_driver.c commit 800bf53279e2c2bf854682bbfd6fa16d03afed00 Author: Matthieu Herrb <matth...@deville.herrb.com> @@ -6233,8 +6324,8 @@ Conflicts: - src/radeon_display.c - src/radeon_driver.c + src/radeon_display.c + src/radeon_driver.c commit 3b43788c45f51ad2d3e8e64383c412f4ddd97207 Author: Dave Airlie <airl...@linux.ie> @@ -7744,7 +7835,7 @@ Conflicts: - src/radeon_driver.c + src/radeon_driver.c commit 9fa176c7989030e7340cc9b85d0b6a7b34303091 Author: Alex Deucher <alex@samba.(none)> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/compile new/xf86-video-mach64-6.9.6/compile --- old/xf86-video-mach64-6.9.5/compile 2015-05-04 21:50:39.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/compile 2018-05-18 18:51:46.000000000 +0200 @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2017 Free Software Foundation, Inc. # Written by Tom Tromey <tro...@cygnus.com>. # # This program is free software; you can redistribute it and/or modify @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -342,6 +343,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/config.h.in new/xf86-video-mach64-6.9.6/config.h.in --- old/xf86-video-mach64-6.9.5/config.h.in 2015-05-04 21:50:38.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/config.h.in 2018-05-18 18:51:46.000000000 +0200 @@ -44,8 +44,7 @@ /* xextproto 7.1 available */ #undef HAVE_XEXTPROTO_71 -/* Define to the sub-directory in which libtool stores uninstalled libraries. - */ +/* Define to the sub-directory where libtool stores uninstalled libraries. */ #undef LT_OBJDIR /* Name of package */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/configure.ac new/xf86-video-mach64-6.9.6/configure.ac --- old/xf86-video-mach64-6.9.5/configure.ac 2015-05-04 21:50:04.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/configure.ac 2018-05-18 18:51:41.000000000 +0200 @@ -23,7 +23,7 @@ # Initialize Autoconf AC_PREREQ([2.60]) AC_INIT([xf86-video-mach64], - [6.9.5], + [6.9.6], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [xf86-video-mach64]) AC_CONFIG_SRCDIR([Makefile.am]) @@ -32,7 +32,6 @@ # Initialize Automake AM_INIT_AUTOMAKE([foreign dist-bzip2]) -AM_MAINTAINER_MODE # Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS m4_ifndef([XORG_MACROS_VERSION], diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/missing new/xf86-video-mach64-6.9.6/missing --- old/xf86-video-mach64-6.9.5/missing 2015-05-04 21:50:39.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/missing 2018-05-18 18:51:46.000000000 +0200 @@ -1,9 +1,9 @@ -#! /bin/sh +#!/bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2016-01-11.22; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2017 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <pin...@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify @@ -210,6 +210,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/atidri.c new/xf86-video-mach64-6.9.6/src/atidri.c --- old/xf86-video-mach64-6.9.5/src/atidri.c 2014-01-22 19:41:46.000000000 +0100 +++ new/xf86-video-mach64-6.9.6/src/atidri.c 2018-05-18 18:51:41.000000000 +0200 @@ -52,220 +52,13 @@ #include "xf86.h" #include "windowstr.h" -/* GLX/DRI/DRM definitions */ +/* DRI/DRM definitions */ #define _XF86DRI_SERVER_ -#include "GL/glxtokens.h" #include "sarea.h" static char ATIKernelDriverName[] = "mach64"; static char ATIClientDriverName[] = "mach64"; -/* Initialize the visual configs that are supported by the hardware. - * These are combined with the visual configs that the indirect - * rendering core supports, and the intersection is exported to the - * client. - */ -static Bool ATIInitVisualConfigs( ScreenPtr pScreen ) -{ - ScrnInfoPtr pScreenInfo = xf86ScreenToScrn(pScreen); - ATIPtr pATI = ATIPTR(pScreenInfo); - int numConfigs = 0; - __GLXvisualConfig *pConfigs = NULL; - ATIConfigPrivPtr pATIConfigs = NULL; - ATIConfigPrivPtr *pATIConfigPtrs = NULL; - int i, accum, stencil, db; - - switch ( pATI->bitsPerPixel ) { - case 8: /* 8bpp mode is not support */ - case 15: /* FIXME */ - case 24: /* FIXME */ - xf86DrvMsg(pScreen->myNum, X_ERROR, - "[dri] ATIInitVisualConfigs failed (%d bpp not supported). " - "Disabling DRI.\n", pATI->bitsPerPixel); - return FALSE; - -#define ATI_USE_ACCUM 1 -#define ATI_USE_STENCIL 1 - - case 16: - - if ( pATI->depth != 16) { - xf86DrvMsg(pScreen->myNum, X_ERROR, - "[dri] ATIInitVisualConfigs failed (depth %d at 16 bpp not supported). " - "Disabling DRI.\n", pATI->depth); - return FALSE; - } - - numConfigs = 1; - if ( ATI_USE_ACCUM ) numConfigs *= 2; - if ( ATI_USE_STENCIL ) numConfigs *= 2; - numConfigs *= 2; /* single- and double-buffered */ - - pConfigs = (__GLXvisualConfig*) - xnfcalloc( sizeof(__GLXvisualConfig), numConfigs ); - if ( !pConfigs ) { - return FALSE; - } - pATIConfigs = (ATIConfigPrivPtr) - xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs ); - if ( !pATIConfigs ) { - free( pConfigs ); - return FALSE; - } - pATIConfigPtrs = (ATIConfigPrivPtr*) - xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs ); - if ( !pATIConfigPtrs ) { - free( pConfigs ); - free( pATIConfigs ); - return FALSE; - } - - i = 0; - for (db = 1; db >= 0; db--) { - for ( accum = 0 ; accum <= ATI_USE_ACCUM ; accum++ ) { - for ( stencil = 0 ; stencil <= ATI_USE_STENCIL ; stencil++ ) { - pATIConfigPtrs[i] = &pATIConfigs[i]; - - pConfigs[i].vid = -1; - pConfigs[i].class = -1; - pConfigs[i].rgba = TRUE; - pConfigs[i].redSize = 5; - pConfigs[i].greenSize = 6; - pConfigs[i].blueSize = 5; - pConfigs[i].alphaSize = 0; - pConfigs[i].redMask = 0x0000F800; - pConfigs[i].greenMask = 0x000007E0; - pConfigs[i].blueMask = 0x0000001F; - pConfigs[i].alphaMask = 0x00000000; - if ( accum ) { /* Simulated in software */ - pConfigs[i].accumRedSize = 16; - pConfigs[i].accumGreenSize = 16; - pConfigs[i].accumBlueSize = 16; - pConfigs[i].accumAlphaSize = 0; - } else { - pConfigs[i].accumRedSize = 0; - pConfigs[i].accumGreenSize = 0; - pConfigs[i].accumBlueSize = 0; - pConfigs[i].accumAlphaSize = 0; - } - pConfigs[i].doubleBuffer = db ? TRUE : FALSE; - pConfigs[i].stereo = FALSE; - pConfigs[i].bufferSize = 16; - pConfigs[i].depthSize = 16; - if ( stencil ) { /* Simulated in software */ - pConfigs[i].stencilSize = 8; - } else { - pConfigs[i].stencilSize = 0; - } - pConfigs[i].auxBuffers = 0; - pConfigs[i].level = 0; - if ( accum || stencil ) { - pConfigs[i].visualRating = GLX_SLOW_CONFIG; - } else { - pConfigs[i].visualRating = GLX_NONE; - } - pConfigs[i].transparentPixel = GLX_NONE; - pConfigs[i].transparentRed = 0; - pConfigs[i].transparentGreen = 0; - pConfigs[i].transparentBlue = 0; - pConfigs[i].transparentAlpha = 0; - pConfigs[i].transparentIndex = 0; - i++; - } - } - } - break; - - case 32: - numConfigs = 1; - if ( ATI_USE_ACCUM ) numConfigs *= 2; - if ( ATI_USE_STENCIL ) numConfigs *= 2; - numConfigs *= 2; /* single- and double-buffered */ - - pConfigs = (__GLXvisualConfig*) - xnfcalloc( sizeof(__GLXvisualConfig), numConfigs ); - if ( !pConfigs ) { - return FALSE; - } - pATIConfigs = (ATIConfigPrivPtr) - xnfcalloc( sizeof(ATIConfigPrivRec), numConfigs ); - if ( !pATIConfigs ) { - free( pConfigs ); - return FALSE; - } - pATIConfigPtrs = (ATIConfigPrivPtr*) - xnfcalloc( sizeof(ATIConfigPrivPtr), numConfigs ); - if ( !pATIConfigPtrs ) { - free( pConfigs ); - free( pATIConfigs ); - return FALSE; - } - - i = 0; - for (db = 1; db >= 0; db--) { - for ( accum = 0 ; accum <= ATI_USE_ACCUM ; accum++ ) { - for ( stencil = 0 ; stencil <= ATI_USE_STENCIL ; stencil++ ) { - pATIConfigPtrs[i] = &pATIConfigs[i]; - - pConfigs[i].vid = -1; - pConfigs[i].class = -1; - pConfigs[i].rgba = TRUE; - pConfigs[i].redSize = 8; - pConfigs[i].greenSize = 8; - pConfigs[i].blueSize = 8; - pConfigs[i].alphaSize = 0; - pConfigs[i].redMask = 0x00FF0000; - pConfigs[i].greenMask = 0x0000FF00; - pConfigs[i].blueMask = 0x000000FF; - pConfigs[i].alphaMask = 0x00000000; - if ( accum ) { /* Simulated in software */ - pConfigs[i].accumRedSize = 16; - pConfigs[i].accumGreenSize = 16; - pConfigs[i].accumBlueSize = 16; - pConfigs[i].accumAlphaSize = 0; - } else { - pConfigs[i].accumRedSize = 0; - pConfigs[i].accumGreenSize = 0; - pConfigs[i].accumBlueSize = 0; - pConfigs[i].accumAlphaSize = 0; - } - pConfigs[i].doubleBuffer = db ? TRUE : FALSE; - pConfigs[i].stereo = FALSE; - pConfigs[i].bufferSize = 24; - if ( stencil ) { /* Simulated in software */ - pConfigs[i].depthSize = 16; - pConfigs[i].stencilSize = 8; - } else { - pConfigs[i].depthSize = 16; - pConfigs[i].stencilSize = 0; - } - pConfigs[i].auxBuffers = 0; - pConfigs[i].level = 0; - if ( accum || stencil ) { - pConfigs[i].visualRating = GLX_SLOW_CONFIG; - } else { - pConfigs[i].visualRating = GLX_NONE; - } - pConfigs[i].transparentPixel = GLX_NONE; - pConfigs[i].transparentRed = 0; - pConfigs[i].transparentGreen = 0; - pConfigs[i].transparentBlue = 0; - pConfigs[i].transparentAlpha = 0; - pConfigs[i].transparentIndex = 0; - i++; - } - } - } - break; - } - - pATI->numVisualConfigs = numConfigs; - pATI->pVisualConfigs = pConfigs; - pATI->pVisualConfigsPriv = pATIConfigs; - GlxSetVisualConfigs( numConfigs, pConfigs, (void**)pATIConfigPtrs ); - return TRUE; -} - /* Create the ATI-specific context information */ static Bool ATICreateContext( ScreenPtr pScreen, VisualPtr visual, drm_context_t hwContext, void *pVisualConfigPriv, @@ -1181,10 +974,9 @@ drmVersionPtr version; int major, minor, patch; - /* Check that the GLX, DRI, and DRM modules have been loaded by testing + /* Check that the DRI, and DRM modules have been loaded by testing * for known symbols in each module. */ - if ( !xf86LoaderCheckSymbol("GlxSetVisualConfigs") ) return FALSE; if ( !xf86LoaderCheckSymbol("drmAvailable") ) return FALSE; if ( !xf86LoaderCheckSymbol("DRIQueryVersion") ) { xf86DrvMsg( pScreen->myNum, X_ERROR, @@ -1426,10 +1218,6 @@ return FALSE; } - if ( !ATIInitVisualConfigs( pScreen ) ) { - ATIDRICloseScreen( pScreen ); - return FALSE; - } xf86DrvMsg( pScreenInfo->scrnIndex, X_INFO, "[dri] Visual configs initialized\n" ); @@ -1629,12 +1417,4 @@ free( pATI->pDRIServerInfo ); pATI->pDRIServerInfo = NULL; } - if ( pATI->pVisualConfigs ) { - free( pATI->pVisualConfigs ); - pATI->pVisualConfigs = NULL; - } - if ( pATI->pVisualConfigsPriv ) { - free( pATI->pVisualConfigsPriv ); - pATI->pVisualConfigsPriv = NULL; - } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/atidripriv.h new/xf86-video-mach64-6.9.6/src/atidripriv.h --- old/xf86-video-mach64-6.9.5/src/atidripriv.h 2014-01-22 19:41:46.000000000 +0100 +++ new/xf86-video-mach64-6.9.6/src/atidripriv.h 2018-05-18 18:51:41.000000000 +0200 @@ -37,21 +37,11 @@ #ifndef __ATIDRIPRIV_H__ #define __ATIDRIPRIV_H__ 1 -#include "GL/glxint.h" -#include "GL/glxtokens.h" - #define ATI_MAX_DRAWABLES 256 typedef struct { /* Nothing here yet */ int dummy; -} ATIConfigPrivRec, *ATIConfigPrivPtr; - -typedef struct { - /* Nothing here yet */ - int dummy; } ATIDRIContextRec, *ATIDRIContextPtr; -extern void GlxSetVisualConfigs(int, __GLXvisualConfig *, void **); - #endif /* __ATIDRIPRIV_H__ */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/atipreinit.c new/xf86-video-mach64-6.9.6/src/atipreinit.c --- old/xf86-video-mach64-6.9.5/src/atipreinit.c 2015-05-04 21:49:43.000000000 +0200 +++ new/xf86-video-mach64-6.9.6/src/atipreinit.c 2018-05-18 18:51:41.000000000 +0200 @@ -2252,8 +2252,6 @@ pitchInc = minPitch * pATI->bitsPerPixel; - pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3; - if (pATI->Chip < ATI_CHIP_264VT) { /* @@ -2264,12 +2262,8 @@ */ ATIClockRange.doubleScanAllowed = FALSE; - /* CRTC_H_TOTAL is one bit narrower */ - pScreenInfo->maxHValue >>= 1; } - pScreenInfo->maxVValue = MaxBits(CRTC_V_TOTAL) + 1; - maxPitch = minPitch * MaxBits(CRTC_PITCH); if (pATI->OptionAccel) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/atiscreen.c new/xf86-video-mach64-6.9.6/src/atiscreen.c --- old/xf86-video-mach64-6.9.5/src/atiscreen.c 2014-01-22 19:41:46.000000000 +0100 +++ new/xf86-video-mach64-6.9.6/src/atiscreen.c 2018-05-18 18:51:41.000000000 +0200 @@ -395,8 +395,7 @@ #ifdef XF86DRI_DEVEL /* Setup DRI after visuals have been established, but before - * fbScreenInit is called. fbScreenInit will eventually call the - * driver's InitGLXVisuals call back. + * fbScreenInit is called. */ /* According to atiregs.h, GTPro (3D Rage Pro) is the first chip type with diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/atistruct.h new/xf86-video-mach64-6.9.6/src/atistruct.h --- old/xf86-video-mach64-6.9.5/src/atistruct.h 2014-01-22 19:41:46.000000000 +0100 +++ new/xf86-video-mach64-6.9.6/src/atistruct.h 2018-05-18 18:51:41.000000000 +0200 @@ -497,9 +497,6 @@ DRIInfoPtr pDRIInfo; int drmFD; int irq; - int numVisualConfigs; - __GLXvisualConfig *pVisualConfigs; - ATIConfigPrivPtr pVisualConfigsPriv; ATIDRIServerInfoPtr pDRIServerInfo; Bool NeedDRISync; Bool have3DWindows; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-video-mach64-6.9.5/src/ativalid.c new/xf86-video-mach64-6.9.6/src/ativalid.c --- old/xf86-video-mach64-6.9.5/src/ativalid.c 2014-01-22 19:41:46.000000000 +0100 +++ new/xf86-video-mach64-6.9.6/src/ativalid.c 2018-05-18 18:51:41.000000000 +0200 @@ -53,6 +53,23 @@ return MODE_OK; } + { + int maxHValue, maxVValue; + + maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3; + if (pATI->Chip < ATI_CHIP_264VT) + { + /* CRTC_H_TOTAL is one bit narrower */ + maxHValue >>= 1; + } + if (pMode->HTotal > maxHValue) + return MODE_BAD_HVALUE; + + maxVValue = MaxBits(CRTC_V_TOTAL) + 1; + if (pMode->VTotal > maxVValue) + return MODE_BAD_VVALUE; + } + /* * The following is done for every mode in the monitor section that * survives the common layer's basic checks.
