Hello community,
here is the log from the commit of package xf86-video-tdfx for openSUSE:Factory
checked in at 2019-02-19 11:59:24
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/xf86-video-tdfx (Old)
and /work/SRC/openSUSE:Factory/.xf86-video-tdfx.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xf86-video-tdfx"
Tue Feb 19 11:59:24 2019 rev:13 rq:676840 version:1.5.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/xf86-video-tdfx/xf86-video-tdfx.changes
2017-01-24 10:35:08.423600043 +0100
+++
/work/SRC/openSUSE:Factory/.xf86-video-tdfx.new.28833/xf86-video-tdfx.changes
2019-02-19 12:00:10.477145530 +0100
@@ -1,0 +2,8 @@
+Sun Feb 17 18:17:15 UTC 2019 - [email protected]
+
+- Update to version 1.5.0
+ * This is a maintenance release of 3dfx DDX for X.Org X Server.
+ The DDX compiles cleanly without compilation warnings on
+ X Server 1.19.6.
+
+-------------------------------------------------------------------
Old:
----
xf86-video-tdfx-1.4.7.tar.bz2
New:
----
xf86-video-tdfx-1.5.0.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xf86-video-tdfx.spec ++++++
--- /var/tmp/diff_new_pack.lcZVDs/_old 2019-02-19 12:00:11.549144966 +0100
+++ /var/tmp/diff_new_pack.lcZVDs/_new 2019-02-19 12:00:11.557144962 +0100
@@ -1,7 +1,7 @@
#
# spec file for package xf86-video-tdfx
#
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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-tdfx
-Version: 1.4.7
+Version: 1.5.0
Release: 0
Summary: 3Dfx video driver for the Xorg X server
License: MIT
@@ -60,7 +60,7 @@
%files
%defattr(-,root,root)
-%doc ChangeLog COPYING README
+%doc ChangeLog COPYING README.md
%dir %{_libdir}/xorg/modules/drivers
%{_libdir}/xorg/modules/drivers/tdfx_drv.so
%{_datadir}/man/man4/tdfx.4%{?ext_man}
++++++ xf86-video-tdfx-1.4.7.tar.bz2 -> xf86-video-tdfx-1.5.0.tar.bz2 ++++++
++++ 2146 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-tdfx-1.4.7/ChangeLog new/xf86-video-tdfx-1.5.0/ChangeLog
--- old/xf86-video-tdfx-1.4.7/ChangeLog 2017-01-17 23:48:40.000000000 +0100
+++ new/xf86-video-tdfx-1.5.0/ChangeLog 2019-02-16 01:24:26.000000000 +0100
@@ -1,3 +1,128 @@
+commit affd8b212f7ddeaf3ebfcbfca87ff4a9d4ef3d6a
+Author: Kevin Brace <[email protected]>
+Date: Fri Feb 15 16:21:00 2019 -0800
+
+ Version bumped to 1.5.0
+
+ Signed-off-by: Kevin Brace <[email protected]>
+
+commit 0d36f238a32a6eac3eb7c2f44c3326d6bac84cb0
+Author: Kevin Brace <[email protected]>
+Date: Mon Jan 28 20:41:34 2019 -0800
+
+ Eliminate log message parameter type compilation warnings
+
+ Signed-off-by: Kevin Brace <[email protected]>
+
+commit 37023cd1d0ddfb61a7e607c8b50fbb14c30cd8ae
+Author: Kevin Brace <[email protected]>
+Date: Mon Jan 28 20:23:20 2019 -0800
+
+ Changing result parameter type for ScreenWakeupHandlerProcPtr
+
+ For ABI_VIDEODRV_VERSION >= 23, it was changed to int from unsigned
+ long.
+
+ Signed-off-by: Kevin Brace <[email protected]>
+ Reviewed-by: Matt Turner <[email protected]>
+
+commit f144b07e0b46fb35d401b1deeec8b3b45d697372
+Author: Kevin Brace <[email protected]>
+Date: Tue Dec 25 07:39:46 2018 -0600
+
+ Eliminate set but not used variable compilation warnings
+
+ Signed-off-by: Kevin Brace <[email protected]>
+
+commit 790b72944e18dfd637e057cde88fc74e3449c246
+Author: Kevin Brace <[email protected]>
+Date: Tue Dec 25 07:38:18 2018 -0600
+
+ Eliminate unused variable compilation warning
+
+ Signed-off-by: Kevin Brace <[email protected]>
+
+commit 7ebcfcfae6c947a968611ce112fe781ecc34b7f2
+Author: Alan Coopersmith <[email protected]>
+Date: Fri Dec 7 19:14:00 2018 -0800
+
+ Update configure.ac bug URL for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <[email protected]>
+
+commit b753fcfa21085eb87d219a84011eeb16e8bfcd7d
+Author: Alan Coopersmith <[email protected]>
+Date: Sun Nov 18 16:34:01 2018 -0800
+
+ Update README for gitlab migration
+
+ Signed-off-by: Alan Coopersmith <[email protected]>
+
+commit dfe3f54292b3fd37230fb017c80e91038eedfbb5
+Author: Emil Velikov <[email protected]>
+Date: Mon Jul 17 12:07:43 2017 +0100
+
+ xf86-video-tdfx: 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: Guillem Jover <[email protected]>
+ Cc: Adam Jackson <[email protected]>
+ Signed-off-by: Emil Velikov <[email protected]>
+
+commit 2ddfad3b4b888d26c9878b0a95d57a9912a5c006
+Author: Mihail Konev <[email protected]>
+Date: Thu Jan 26 14:00:22 2017 +1000
+
+ autogen: add default patch prefix
+
+ Signed-off-by: Mihail Konev <[email protected]>
+
+commit 9ba9c1fbb7905f44dee2c0b9eb4760505b4bac8a
+Author: Emil Velikov <[email protected]>
+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 <[email protected]>
+ Reviewed-by: Peter Hutterer <[email protected]>
+ Signed-off-by: Peter Hutterer <[email protected]>
+
+commit 951b08c8f8e3f305e575935600728e2fb3be09da
+Author: Peter Hutterer <[email protected]>
+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 <[email protected]>
+ Reviewed-by: Emil Velikov <[email protected]>
+
+commit c9b6d179fb3cded181fa99c3603e332e3433200e
+Author: Alan Coopersmith <[email protected]>
+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 <[email protected]>
+
+commit be42d3f24802f76f2ec8953e7b3fb8107ca7b755
+Author: Alan Coopersmith <[email protected]>
+Date: Sun Jun 1 21:03:13 2014 -0700
+
+ configure: Drop AM_MAINTAINER_MODE
+
+ Signed-off-by: Alan Coopersmith <[email protected]>
+
commit 4dd4a5da0697d33df0f456ccf224d5be945b7aab
Author: Matt Turner <[email protected]>
Date: Tue Jan 17 14:48:21 2017 -0800
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-tdfx-1.4.7/Makefile.am new/xf86-video-tdfx-1.5.0/Makefile.am
--- old/xf86-video-tdfx-1.4.7/Makefile.am 2010-03-07 20:36:22.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/Makefile.am 2019-02-16 01:22:15.000000000
+0100
@@ -29,3 +29,5 @@
$(CHANGELOG_CMD)
dist-hook: ChangeLog INSTALL
+
+EXTRA_DIST = README.md
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-tdfx-1.4.7/README new/xf86-video-tdfx-1.5.0/README
--- old/xf86-video-tdfx-1.4.7/README 2010-03-07 20:36:22.000000000 +0100
+++ new/xf86-video-tdfx-1.5.0/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,20 +0,0 @@
-xf86-video-tdfx - 3Dfx video driver for the Xorg X server
-
-Please submit bugs & patches to the Xorg bugzilla:
-
- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
-
-All questions regarding this software should be directed at the
-Xorg mailing list:
-
- http://lists.freedesktop.org/mailman/listinfo/xorg
-
-The master development code repository can be found at:
-
- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-tdfx
-
- http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx
-
-For more information on the git code manager, see:
-
- http://wiki.x.org/wiki/GitPage
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-tdfx-1.4.7/README.md new/xf86-video-tdfx-1.5.0/README.md
--- old/xf86-video-tdfx-1.4.7/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/xf86-video-tdfx-1.5.0/README.md 2019-02-16 01:22:15.000000000 +0100
@@ -0,0 +1,18 @@
+xf86-video-tdfx - 3Dfx video driver for the Xorg X server
+---------------------------------------------------------
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+ https://lists.x.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+ https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx
+
+Please submit bug reports and requests to merge patches there.
+
+For patch submission instructions, see:
+
+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
+
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-tdfx-1.4.7/configure.ac new/xf86-video-tdfx-1.5.0/configure.ac
--- old/xf86-video-tdfx-1.4.7/configure.ac 2017-01-17 23:48:19.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/configure.ac 2019-02-16 01:22:15.000000000
+0100
@@ -23,8 +23,8 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-video-tdfx],
- [1.4.7],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
+ [1.5.0],
+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx/issues],
[xf86-video-tdfx])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
@@ -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-tdfx-1.4.7/src/compat-api.h
new/xf86-video-tdfx-1.5.0/src/compat-api.h
--- old/xf86-video-tdfx-1.4.7/src/compat-api.h 2017-01-17 23:48:07.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/src/compat-api.h 2019-02-16 01:22:15.000000000
+0100
@@ -82,7 +82,7 @@
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
#define BLOCKHANDLER_ARGS arg, pTimeout
-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
#define WAKEUPHANDLER_ARGS arg, result
#else
#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer
pReadmask
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-tdfx-1.4.7/src/tdfx.h new/xf86-video-tdfx-1.5.0/src/tdfx.h
--- old/xf86-video-tdfx-1.4.7/src/tdfx.h 2015-02-22 22:25:54.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/src/tdfx.h 2019-02-16 01:22:15.000000000
+0100
@@ -26,7 +26,6 @@
#include "sarea.h"
#define _XF86DRI_SERVER_
#include "dri.h"
-#include "GL/glxint.h"
#include "tdfx_dri.h"
#include "tdfx_dripriv.h"
#endif
@@ -276,9 +275,6 @@
Bool directRenderingEnabled;
DRIInfoPtr pDRIInfo;
int drmSubFD;
- int numVisualConfigs;
- __GLXvisualConfig* pVisualConfigs;
- TDFXConfigPrivPtr pVisualConfigsPriv;
TDFXRegRec DRContextRegs;
#endif
/* State for video */
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-tdfx-1.4.7/src/tdfx_dri.c
new/xf86-video-tdfx-1.5.0/src/tdfx_dri.c
--- old/xf86-video-tdfx-1.4.7/src/tdfx_dri.c 2015-02-22 22:25:54.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/src/tdfx_dri.c 2019-02-16 01:22:15.000000000
+0100
@@ -8,8 +8,6 @@
#include "xf86Pci.h"
#include "fb.h"
#include "miline.h"
-#include "GL/glxint.h"
-#include "GL/glxtokens.h"
#include "tdfx.h"
#include "tdfx_dri.h"
#include "tdfx_dripriv.h"
@@ -35,211 +33,6 @@
static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
-static Bool
-TDFXInitVisualConfigs(ScreenPtr pScreen)
-{
- ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
- TDFXPtr pTDFX = TDFXPTR(pScrn);
- int numConfigs = 0;
- __GLXvisualConfig *pConfigs = 0;
- TDFXConfigPrivPtr pTDFXConfigs = 0;
- TDFXConfigPrivPtr *pTDFXConfigPtrs = 0;
- int i, db, stencil, accum, depth;
-
- switch (pScrn->bitsPerPixel) {
- case 8:
- case 16:
- numConfigs = 16;
-
- if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
- numConfigs))) {
- return FALSE;
- }
- if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
- numConfigs))) {
- free(pConfigs);
- return FALSE;
- }
- if (!(pTDFXConfigPtrs =
(TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
- numConfigs))) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
- }
- for (i=0; i<numConfigs; i++)
- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
-
- i=0;
- depth=1;
- for (db = 0; db <=1; db++) {
- for (depth = 0; depth<=1; depth++) {
- for (accum = 0; accum <= 1; accum++) {
- for (stencil = 0; stencil <= 1; stencil++) {
- 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].redMask = 0x0000F800;
- pConfigs[i].greenMask = 0x000007E0;
- pConfigs[i].blueMask = 0x0000001F;
- pConfigs[i].alphaMask = 0;
- if (accum) {
- 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;
- }
- if (db)
- pConfigs[i].doubleBuffer = TRUE;
- else
- pConfigs[i].doubleBuffer = FALSE;
- pConfigs[i].stereo = FALSE;
- pConfigs[i].bufferSize = 16;
- if (depth) {
- if (pTDFX->cpp>2)
- pConfigs[i].depthSize = 24;
- else
- pConfigs[i].depthSize = 16;
- } else {
- pConfigs[i].depthSize = 0;
- }
- if (stencil)
- pConfigs[i].stencilSize = 8;
- else
- pConfigs[i].stencilSize = 0;
- pConfigs[i].auxBuffers = 0;
- pConfigs[i].level = 0;
- if (stencil || accum)
- 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++;
- }
- }
- }
- }
- if (i!=numConfigs) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
- return FALSE;
- }
- break; /* 16bpp */
-
- case 24:
- case 32:
- numConfigs = 8;
-
- pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig),
numConfigs);
- if (!pConfigs)
- return FALSE;
-
- pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec),
numConfigs);
- if (!pTDFXConfigs) {
- free(pConfigs);
- return FALSE;
- }
-
- pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr),
numConfigs);
- if (!pTDFXConfigPtrs) {
- free(pConfigs);
- free(pTDFXConfigs);
- return FALSE;
- }
-
- for (i = 0; i < numConfigs; i++)
- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
-
- i=0;
- for (db = 0; db <=1; db++) {
- for (depth = 0; depth<=1; depth++) {
- /*stencil = depth;*/ /* Z and stencil share the same memory */
- for (accum = 0; accum <= 1; accum++) {
- /*for (stencil = 0; stencil <=1; stencil++) {*/
- stencil = depth;
- 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 = (pScrn->bitsPerPixel==32) ? 8 : 0;
- pConfigs[i].redMask = 0x00ff0000;
- pConfigs[i].greenMask = 0x0000ff00;
- pConfigs[i].blueMask = 0x000000ff;
- pConfigs[i].alphaMask = (pScrn->bitsPerPixel==32) ? 0xff000000 : 0;
- if (accum) {
- pConfigs[i].accumRedSize = 16;
- pConfigs[i].accumGreenSize = 16;
- pConfigs[i].accumBlueSize = 16;
- pConfigs[i].accumAlphaSize = (pScrn->bitsPerPixel==32) ? 16 : 0;
- } else {
- pConfigs[i].accumRedSize = 0;
- pConfigs[i].accumGreenSize = 0;
- pConfigs[i].accumBlueSize = 0;
- pConfigs[i].accumAlphaSize = 0;
- }
- if (db)
- pConfigs[i].doubleBuffer = TRUE;
- else
- pConfigs[i].doubleBuffer = FALSE;
- pConfigs[i].stereo = FALSE;
- pConfigs[i].bufferSize = (pScrn->bitsPerPixel==32) ? 32 : 24;
- if (depth) {
- if (pTDFX->cpp > 2)
- pConfigs[i].depthSize = 24;
- else
- pConfigs[i].depthSize = 16;
- } else {
- pConfigs[i].depthSize = 0;
- }
- if (stencil)
- pConfigs[i].stencilSize = 8;
- else
- pConfigs[i].stencilSize = 0;
- pConfigs[i].auxBuffers = 0;
- pConfigs[i].level = 0;
- if (accum)
- 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++;
- /*}*/
- }
- }
- }
- if (i!=numConfigs) {
- xf86DrvMsg(pScreen->myNum, X_ERROR,
- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
- return FALSE;
- }
- break;
- }
- pTDFX->numVisualConfigs = numConfigs;
- pTDFX->pVisualConfigs = pConfigs;
- pTDFX->pVisualConfigsPriv = pTDFXConfigs;
- GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pTDFXConfigPtrs);
- return TRUE;
-}
-
static void
TDFXDoWakeupHandler(WAKEUPHANDLER_ARGS_DECL)
{
@@ -304,9 +97,8 @@
return FALSE;
}
- /* 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 canonical symbols in each module. */
- if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
if (!xf86LoaderCheckSymbol("drmAvailable")) return FALSE;
if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
xf86DrvMsg(pScreen->myNum, X_ERROR,
@@ -457,11 +249,6 @@
xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n",
pTDFXDRI->regs);
- if (!(TDFXInitVisualConfigs(pScreen))) {
- TDFXDRICloseScreen(pScreen);
- xf86DrvMsg(pScreen->myNum, X_ERROR, "TDFXInitVisualConfigs failed,
disabling DRI.\n");
- return FALSE;
- }
xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
return TRUE;
@@ -483,8 +270,6 @@
DRIDestroyInfoRec(pTDFX->pDRIInfo);
pTDFX->pDRIInfo=0;
}
- if (pTDFX->pVisualConfigs) free(pTDFX->pVisualConfigs);
- if (pTDFX->pVisualConfigsPriv) free(pTDFX->pVisualConfigsPriv);
}
static Bool
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-tdfx-1.4.7/src/tdfx_dripriv.h
new/xf86-video-tdfx-1.5.0/src/tdfx_dripriv.h
--- old/xf86-video-tdfx-1.4.7/src/tdfx_dripriv.h 2010-03-07
20:36:22.000000000 +0100
+++ new/xf86-video-tdfx-1.5.0/src/tdfx_dripriv.h 2019-02-16
01:22:15.000000000 +0100
@@ -4,17 +4,6 @@
#define TDFX_MAX_DRAWABLES 256
-extern void GlxSetVisualConfigs(
- int nconfigs,
- __GLXvisualConfig *configs,
- void **configprivs
-);
-
-typedef struct {
- /* Nothing here yet */
- int dummy;
-} TDFXConfigPrivRec, *TDFXConfigPrivPtr;
-
typedef struct {
/* Nothing here yet */
int dummy;
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-tdfx-1.4.7/src/tdfx_driver.c
new/xf86-video-tdfx-1.5.0/src/tdfx_driver.c
--- old/xf86-video-tdfx-1.4.7/src/tdfx_driver.c 2015-02-22 22:25:54.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/src/tdfx_driver.c 2019-02-16 01:22:15.000000000
+0100
@@ -636,30 +636,30 @@
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
"TDFXInitChips: numchips = %d\n", pTDFX->numChips);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: cfgbits = 0x%08lx, initbits = 0x%08lx\n",
+ "TDFXInitChips: cfgbits = 0x%08x, initbits = 0x%08x\n",
cfgbits, initbits);
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0base = 0x%08lx, mem1base = 0x%08lx\n",
+ "TDFXInitChips: mem0base = 0x%08x, mem1base = 0x%08x\n",
mem0base, mem1base);
mem0size = 32 * 1024 * 1024; /* Registers are always 32MB */
mem1size = pScrn->videoRam * 1024 * 2; /* Linear mapping is 2x memory */
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0size = 0x%08lx, mem1size = 0x%08lx\n",
+ "TDFXInitChips: mem0size = 0x%08x, mem1size = 0x%08x\n",
mem0size, mem1size);
mem0bits = TDFXSizeToCfg(mem0size);
mem1bits = TDFXSizeToCfg(mem1size) << 4;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: mem0bits = 0x%08lx, mem1bits = 0x%08lx\n",
+ "TDFXInitChips: mem0bits = 0x%08x, mem1bits = 0x%08x\n",
mem0bits, mem1bits);
cfgbits = (cfgbits & ~(0xFF)) | mem0bits | mem1bits;
xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
- "TDFXInitChips: cfgbits = 0x%08lx\n", cfgbits);
+ "TDFXInitChips: cfgbits = 0x%08x\n", cfgbits);
for (i = 0; i < pTDFX->numChips; i++) {
PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
@@ -753,7 +753,6 @@
static xf86MonPtr doTDFXDDC(ScrnInfoPtr pScrn)
{
TDFXPtr pTDFX = TDFXPTR(pScrn);
- I2CBusPtr pI2CBus;
xf86MonPtr pMon = NULL;
CARD32 reg;
@@ -2215,9 +2214,6 @@
TDFXPtr pTDFX;
VisualPtr visual;
BoxRec MemBox;
-#ifdef TDFXDRI
- MessageType driFrom = X_DEFAULT;
-#endif
int scanlines;
TDFXTRACE("TDFXScreenInit start\n");
@@ -2325,15 +2321,12 @@
#ifdef TDFXDRI
/*
* Setup DRI after visuals have been established, but before fbScreenInit
- * is called. fbScreenInit will eventually call into the drivers
- * InitGLXVisuals call back.
+ * is called.
*/
if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, TRUE) ||
pTDFX->NoAccel) {
pTDFX->directRenderingEnabled = FALSE;
- driFrom = X_CONFIG;
} else if (pTDFX->texSize < 0) {
pTDFX->directRenderingEnabled = FALSE;
- driFrom = X_PROBED;
} else {
pTDFX->directRenderingEnabled = TDFXDRIScreenInit(pScreen);
}
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-tdfx-1.4.7/src/tdfx_priv.c
new/xf86-video-tdfx-1.5.0/src/tdfx_priv.c
--- old/xf86-video-tdfx-1.4.7/src/tdfx_priv.c 2013-02-07 08:56:21.000000000
+0100
+++ new/xf86-video-tdfx-1.5.0/src/tdfx_priv.c 2019-02-16 01:22:15.000000000
+0100
@@ -240,11 +240,15 @@
ScrnInfoPtr pScrn;
TDFXPtr pTDFX;
int dummy, readPos;
+#if 0
TDFXSAREAPriv *sPriv;
+#endif
pScrn = xf86ScreenToScrn(pScreen);
pTDFX=TDFXPTR(pScrn);
+#if 0
sPriv=(TDFXSAREAPriv*)DRIGetSAREAPrivate(pScreen);
+#endif
/* if (sPriv)
ErrorF("In FifoPtr=%d FifoRead=%d\n", sPriv->fifoPtr, sPriv->fifoRead); */
#if 1
