[Git][xorg-team/driver/xserver-xorg-video-tdfx][upstream-unstable] 13 commits: configure: Drop AM_MAINTAINER_MODE

[Timo Aaltonen <tjaalton@debian.org>]

Title: GitLab

Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / driver / xserver-xorg-video-tdfx

Commits:

• be42d3f2
  by Alan Coopersmith at 2017-01-26T01:16:37Z

  configure: Drop AM_MAINTAINER_MODE
  
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• c9b6d179
  by Alan Coopersmith at 2017-01-26T01:16:37Z

  autogen.sh: Honor NOCONFIGURE=1
  
  See http://people.gnome.org/~walters/docs/build-api.txt
  
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• 951b08c8
  by Peter Hutterer at 2017-01-26T01:23:46Z

  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.hutterer@who-t.net>
  Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
  

• 9ba9c1fb
  by Emil Velikov at 2017-01-26T01:26:28Z

  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.velikov@gmail.com>
  Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
  Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  

• 2ddfad3b
  by Mihail Konev at 2017-01-26T04:00:22Z

  autogen: add default patch prefix
  
  Signed-off-by: Mihail Konev <k.mvc@ya.ru>
  

• dfe3f542
  by Emil Velikov at 2017-07-17T12:58:32Z

  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 <guillem@hadrons.org>
  Cc: Adam Jackson <ajax@redhat.com>
  Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
  

• b753fcfa
  by Alan Coopersmith at 2018-11-19T00:34:01Z

  Update README for gitlab migration
  
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• 7ebcfcfa
  by Alan Coopersmith at 2018-12-08T03:14:00Z

  Update configure.ac bug URL for gitlab migration
  
  Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
  

• 790b7294
  by Kevin Brace at 2018-12-25T13:38:18Z

  Eliminate unused variable compilation warning
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

• f144b07e
  by Kevin Brace at 2018-12-25T13:39:46Z

  Eliminate set but not used variable compilation warnings
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

• 37023cd1
  by Kevin Brace at 2019-02-02T07:46:59Z

  Changing result parameter type for ScreenWakeupHandlerProcPtr
  
  For ABI_VIDEODRV_VERSION >= 23, it was changed to int from unsigned
  long.
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  Reviewed-by: Matt Turner <mattst88@gmail.com>
  

• 0d36f238
  by Kevin Brace at 2019-02-02T07:48:03Z

  Eliminate log message parameter type compilation warnings
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

• affd8b21
  by Kevin Brace at 2019-02-16T00:21:00Z

  Version bumped to 1.5.0
  
  Signed-off-by: Kevin Brace <kevinbrace@gmx.com>
  

10 changed files:

• Makefile.am
• README → README.md
• autogen.sh
• configure.ac
• src/compat-api.h
• src/tdfx.h
• src/tdfx_dri.c
• src/tdfx_dripriv.h
• src/tdfx_driver.c
• src/tdfx_priv.c

Changes:

Makefile.am

---

...	...	@@ -29,3 +29,5 @@ ChangeLog:
29	29	$(CHANGELOG_CMD)
30	30
31	31	dist-hook: ChangeLog INSTALL
	32	+
	33	+EXTRA_DIST = README.md

README → README.md

---

1	1	xf86-video-tdfx - 3Dfx video driver for the Xorg X server
2		-
3		-Please submit bugs & patches to the Xorg bugzilla:
4		-
5		- https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
	2	+---------------------------------------------------------
6	3
7	4	All questions regarding this software should be directed at the
8	5	Xorg mailing list:
9	6
10		- http://lists.freedesktop.org/mailman/listinfo/xorg
	7	+ https://lists.x.org/mailman/listinfo/xorg
11	8
12	9	The master development code repository can be found at:
13	10
14		- git://anongit.freedesktop.org/git/xorg/driver/xf86-video-tdfx
	11	+ https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx
	12	+
	13	+Please submit bug reports and requests to merge patches there.
15	14
16		- http://cgit.freedesktop.org/xorg/driver/xf86-video-tdfx
	15	+For patch submission instructions, see:
17	16
18		-For more information on the git code manager, see:
	17	+ https://www.x.org/wiki/Development/Documentation/SubmittingPatches
19	18
20		- http://wiki.x.org/wiki/GitPage

autogen.sh

---

1	1	#! /bin/sh
2	2
3		-srcdir=`dirname $0`
	3	+srcdir=`dirname "$0"`
4	4	test -z "$srcdir" && srcdir=.
5	5
6	6	ORIGDIR=`pwd`
7		-cd $srcdir
	7	+cd "$srcdir"
8	8
9	9	autoreconf -v --install || exit 1
10		-cd $ORIGDIR || exit $?
	10	+cd "$ORIGDIR" || exit $?
11	11
12		-$srcdir/configure --enable-maintainer-mode "$@"
	12	+git config --local --get format.subjectPrefix >/dev/null 2>&1 ||
	13	+ git config --local format.subjectPrefix "PATCH xf86-video-tdfx"
	14	+
	15	+if test -z "$NOCONFIGURE"; then
	16	+ exec "$srcdir"/configure "$@"
	17	+fi

configure.ac

---

...	...	@@ -23,8 +23,8 @@
23	23	# Initialize Autoconf
24	24	AC_PREREQ([2.60])
25	25	AC_INIT([xf86-video-tdfx],
26		- [1.4.7],
27		- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
	26	+ [1.5.0],
	27	+ [https://gitlab.freedesktop.org/xorg/driver/xf86-video-tdfx/issues],
28	28	[xf86-video-tdfx])
29	29	AC_CONFIG_SRCDIR([Makefile.am])
30	30	AC_CONFIG_HEADERS([config.h])
...	...	@@ -32,7 +32,6 @@ AC_CONFIG_AUX_DIR(.)
32	32
33	33	# Initialize Automake
34	34	AM_INIT_AUTOMAKE([foreign dist-bzip2])
35		-AM_MAINTAINER_MODE
36	35
37	36	# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
38	37	m4_ifndef([XORG_MACROS_VERSION],

src/compat-api.h

---

...	...	@@ -82,7 +82,7 @@
82	82	#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout
83	83	#define BLOCKHANDLER_ARGS arg, pTimeout
84	84
85		-#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, unsigned long result
	85	+#define WAKEUPHANDLER_ARGS_DECL ScreenPtr arg, int result
86	86	#define WAKEUPHANDLER_ARGS arg, result
87	87	#else
88	88	#define BLOCKHANDLER_ARGS_DECL ScreenPtr arg, pointer pTimeout, pointer pReadmask

src/tdfx.h

---

...	...	@@ -26,7 +26,6 @@
26	26	#include "sarea.h"
27	27	#define _XF86DRI_SERVER_
28	28	#include "dri.h"
29		-#include "GL/glxint.h"
30	29	#include "tdfx_dri.h"
31	30	#include "tdfx_dripriv.h"
32	31	#endif
...	...	@@ -276,9 +275,6 @@ typedef struct _TDFXRec {
276	275	Bool directRenderingEnabled;
277	276	DRIInfoPtr pDRIInfo;
278	277	int drmSubFD;
279		- int numVisualConfigs;
280		- __GLXvisualConfig* pVisualConfigs;
281		- TDFXConfigPrivPtr pVisualConfigsPriv;
282	278	TDFXRegRec DRContextRegs;
283	279	#endif
284	280	/* State for video */

src/tdfx_dri.c

---

...	...	@@ -8,8 +8,6 @@
8	8	#include "xf86Pci.h"
9	9	#include "fb.h"
10	10	#include "miline.h"
11		-#include "GL/glxint.h"
12		-#include "GL/glxtokens.h"
13	11	#include "tdfx.h"
14	12	#include "tdfx_dri.h"
15	13	#include "tdfx_dripriv.h"
...	...	@@ -35,211 +33,6 @@ static void TDFXDRIMoveBuffers(WindowPtr pParent, DDXPointRec ptOldOrg,
35	33	static void TDFXDRITransitionTo2d(ScreenPtr pScreen);
36	34	static void TDFXDRITransitionTo3d(ScreenPtr pScreen);
37	35
38		-static Bool
39		-TDFXInitVisualConfigs(ScreenPtr pScreen)
40		-{
41		- ScrnInfoPtr pScrn = xf86ScreenToScrn(pScreen);
42		- TDFXPtr pTDFX = TDFXPTR(pScrn);
43		- int numConfigs = 0;
44		- __GLXvisualConfig *pConfigs = 0;
45		- TDFXConfigPrivPtr pTDFXConfigs = 0;
46		- TDFXConfigPrivPtr *pTDFXConfigPtrs = 0;
47		- int i, db, stencil, accum, depth;
48		-
49		- switch (pScrn->bitsPerPixel) {
50		- case 8:
51		- case 16:
52		- numConfigs = 16;
53		-
54		- if (!(pConfigs = (__GLXvisualConfig*)calloc(sizeof(__GLXvisualConfig),
55		- numConfigs))) {
56		- return FALSE;
57		- }
58		- if (!(pTDFXConfigs = (TDFXConfigPrivPtr)calloc(sizeof(TDFXConfigPrivRec),
59		- numConfigs))) {
60		- free(pConfigs);
61		- return FALSE;
62		- }
63		- if (!(pTDFXConfigPtrs = (TDFXConfigPrivPtr*)calloc(sizeof(TDFXConfigPrivPtr),
64		- numConfigs))) {
65		- free(pConfigs);
66		- free(pTDFXConfigs);
67		- return FALSE;
68		- }
69		- for (i=0; i<numConfigs; i++)
70		- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
71		-
72		- i=0;
73		- depth=1;
74		- for (db = 0; db <=1; db++) {
75		- for (depth = 0; depth<=1; depth++) {
76		- for (accum = 0; accum <= 1; accum++) {
77		- for (stencil = 0; stencil <= 1; stencil++) {
78		- pConfigs[i].vid = -1;
79		- pConfigs[i].class = -1;
80		- pConfigs[i].rgba = TRUE;
81		- pConfigs[i].redSize = 5;
82		- pConfigs[i].greenSize = 6;
83		- pConfigs[i].blueSize = 5;
84		- pConfigs[i].redMask = 0x0000F800;
85		- pConfigs[i].greenMask = 0x000007E0;
86		- pConfigs[i].blueMask = 0x0000001F;
87		- pConfigs[i].alphaMask = 0;
88		- if (accum) {
89		- pConfigs[i].accumRedSize = 16;
90		- pConfigs[i].accumGreenSize = 16;
91		- pConfigs[i].accumBlueSize = 16;
92		- pConfigs[i].accumAlphaSize = 0;
93		- } else {
94		- pConfigs[i].accumRedSize = 0;
95		- pConfigs[i].accumGreenSize = 0;
96		- pConfigs[i].accumBlueSize = 0;
97		- pConfigs[i].accumAlphaSize = 0;
98		- }
99		- if (db)
100		- pConfigs[i].doubleBuffer = TRUE;
101		- else
102		- pConfigs[i].doubleBuffer = FALSE;
103		- pConfigs[i].stereo = FALSE;
104		- pConfigs[i].bufferSize = 16;
105		- if (depth) {
106		- if (pTDFX->cpp>2)
107		- pConfigs[i].depthSize = 24;
108		- else
109		- pConfigs[i].depthSize = 16;
110		- } else {
111		- pConfigs[i].depthSize = 0;
112		- }
113		- if (stencil)
114		- pConfigs[i].stencilSize = 8;
115		- else
116		- pConfigs[i].stencilSize = 0;
117		- pConfigs[i].auxBuffers = 0;
118		- pConfigs[i].level = 0;
119		- if (stencil || accum)
120		- pConfigs[i].visualRating = GLX_SLOW_CONFIG;
121		- else
122		- pConfigs[i].visualRating = GLX_NONE;
123		- pConfigs[i].transparentPixel = GLX_NONE;
124		- pConfigs[i].transparentRed = 0;
125		- pConfigs[i].transparentGreen = 0;
126		- pConfigs[i].transparentBlue = 0;
127		- pConfigs[i].transparentAlpha = 0;
128		- pConfigs[i].transparentIndex = 0;
129		- i++;
130		- }
131		- }
132		- }
133		- }
134		- if (i!=numConfigs) {
135		- xf86DrvMsg(pScreen->myNum, X_ERROR,
136		- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
137		- return FALSE;
138		- }
139		- break; /* 16bpp */
140		-
141		- case 24:
142		- case 32:
143		- numConfigs = 8;
144		-
145		- pConfigs = (__GLXvisualConfig*) calloc(sizeof(__GLXvisualConfig), numConfigs);
146		- if (!pConfigs)
147		- return FALSE;
148		-
149		- pTDFXConfigs = (TDFXConfigPrivPtr) calloc(sizeof(TDFXConfigPrivRec), numConfigs);
150		- if (!pTDFXConfigs) {
151		- free(pConfigs);
152		- return FALSE;
153		- }
154		-
155		- pTDFXConfigPtrs = (TDFXConfigPrivPtr *) calloc(sizeof(TDFXConfigPrivPtr), numConfigs);
156		- if (!pTDFXConfigPtrs) {
157		- free(pConfigs);
158		- free(pTDFXConfigs);
159		- return FALSE;
160		- }
161		-
162		- for (i = 0; i < numConfigs; i++)
163		- pTDFXConfigPtrs[i] = &pTDFXConfigs[i];
164		-
165		- i=0;
166		- for (db = 0; db <=1; db++) {
167		- for (depth = 0; depth<=1; depth++) {
168		- /*stencil = depth;*/ /* Z and stencil share the same memory */
169		- for (accum = 0; accum <= 1; accum++) {
170		- /*for (stencil = 0; stencil <=1; stencil++) {*/
171		- stencil = depth;
172		- pConfigs[i].vid = -1;
173		- pConfigs[i].class = -1;
174		- pConfigs[i].rgba = TRUE;
175		- pConfigs[i].redSize = 8;
176		- pConfigs[i].greenSize = 8;
177		- pConfigs[i].blueSize = 8;
178		- pConfigs[i].alphaSize = (pScrn->bitsPerPixel==32) ? 8 : 0;
179		- pConfigs[i].redMask = 0x00ff0000;
180		- pConfigs[i].greenMask = 0x0000ff00;
181		- pConfigs[i].blueMask = 0x000000ff;
182		- pConfigs[i].alphaMask = (pScrn->bitsPerPixel==32) ? 0xff000000 : 0;
183		- if (accum) {
184		- pConfigs[i].accumRedSize = 16;
185		- pConfigs[i].accumGreenSize = 16;
186		- pConfigs[i].accumBlueSize = 16;
187		- pConfigs[i].accumAlphaSize = (pScrn->bitsPerPixel==32) ? 16 : 0;
188		- } else {
189		- pConfigs[i].accumRedSize = 0;
190		- pConfigs[i].accumGreenSize = 0;
191		- pConfigs[i].accumBlueSize = 0;
192		- pConfigs[i].accumAlphaSize = 0;
193		- }
194		- if (db)
195		- pConfigs[i].doubleBuffer = TRUE;
196		- else
197		- pConfigs[i].doubleBuffer = FALSE;
198		- pConfigs[i].stereo = FALSE;
199		- pConfigs[i].bufferSize = (pScrn->bitsPerPixel==32) ? 32 : 24;
200		- if (depth) {
201		- if (pTDFX->cpp > 2)
202		- pConfigs[i].depthSize = 24;
203		- else
204		- pConfigs[i].depthSize = 16;
205		- } else {
206		- pConfigs[i].depthSize = 0;
207		- }
208		- if (stencil)
209		- pConfigs[i].stencilSize = 8;
210		- else
211		- pConfigs[i].stencilSize = 0;
212		- pConfigs[i].auxBuffers = 0;
213		- pConfigs[i].level = 0;
214		- if (accum)
215		- pConfigs[i].visualRating = GLX_SLOW_CONFIG;
216		- else
217		- pConfigs[i].visualRating = GLX_NONE;
218		- pConfigs[i].transparentPixel = GLX_NONE;
219		- pConfigs[i].transparentRed = 0;
220		- pConfigs[i].transparentGreen = 0;
221		- pConfigs[i].transparentBlue = 0;
222		- pConfigs[i].transparentAlpha = 0;
223		- pConfigs[i].transparentIndex = 0;
224		- i++;
225		- /*}*/
226		- }
227		- }
228		- }
229		- if (i!=numConfigs) {
230		- xf86DrvMsg(pScreen->myNum, X_ERROR,
231		- "[dri] TDFXInitVisualConfigs: wrong number of visuals\n");
232		- return FALSE;
233		- }
234		- break;
235		- }
236		- pTDFX->numVisualConfigs = numConfigs;
237		- pTDFX->pVisualConfigs = pConfigs;
238		- pTDFX->pVisualConfigsPriv = pTDFXConfigs;
239		- GlxSetVisualConfigs(numConfigs, pConfigs, (void**)pTDFXConfigPtrs);
240		- return TRUE;
241		-}
242		-
243	36	static void
244	37	TDFXDoWakeupHandler(WAKEUPHANDLER_ARGS_DECL)
245	38	{
...	...	@@ -304,9 +97,8 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
304	97	return FALSE;
305	98	}
306	99
307		- /* Check that the GLX, DRI, and DRM modules have been loaded by testing
	100	+ /* Check that the DRI, and DRM modules have been loaded by testing
308	101	for canonical symbols in each module. */
309		- if (!xf86LoaderCheckSymbol("GlxSetVisualConfigs")) return FALSE;
310	102	if (!xf86LoaderCheckSymbol("drmAvailable")) return FALSE;
311	103	if (!xf86LoaderCheckSymbol("DRIQueryVersion")) {
312	104	xf86DrvMsg(pScreen->myNum, X_ERROR,
...	...	@@ -457,11 +249,6 @@ Bool TDFXDRIScreenInit(ScreenPtr pScreen)
457	249	xf86DrvMsg(pScreen->myNum, X_INFO, "[drm] Registers = 0x%08x\n",
458	250	pTDFXDRI->regs);
459	251
460		- if (!(TDFXInitVisualConfigs(pScreen))) {
461		- TDFXDRICloseScreen(pScreen);
462		- xf86DrvMsg(pScreen->myNum, X_ERROR, "TDFXInitVisualConfigs failed, disabling DRI.\n");
463		- return FALSE;
464		- }
465	252	xf86DrvMsg(pScrn->scrnIndex, X_INFO, "visual configs initialized\n" );
466	253
467	254	return TRUE;
...	...	@@ -483,8 +270,6 @@ TDFXDRICloseScreen(ScreenPtr pScreen)
483	270	DRIDestroyInfoRec(pTDFX->pDRIInfo);
484	271	pTDFX->pDRIInfo=0;
485	272	}
486		- if (pTDFX->pVisualConfigs) free(pTDFX->pVisualConfigs);
487		- if (pTDFX->pVisualConfigsPriv) free(pTDFX->pVisualConfigsPriv);
488	273	}
489	274
490	275	static Bool

src/tdfx_dripriv.h

---

...	...	@@ -4,17 +4,6 @@
4	4
5	5	#define TDFX_MAX_DRAWABLES 256
6	6
7		-extern void GlxSetVisualConfigs(
8		- int nconfigs,
9		- __GLXvisualConfig *configs,
10		- void **configprivs
11		-);
12		-
13		-typedef struct {
14		- /* Nothing here yet */
15		- int dummy;
16		-} TDFXConfigPrivRec, *TDFXConfigPrivPtr;
17		-
18	7	typedef struct {
19	8	/* Nothing here yet */
20	9	int dummy;

src/tdfx_driver.c

---

...	...	@@ -636,30 +636,30 @@ TDFXInitChips(ScrnInfoPtr pScrn)
636	636	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
637	637	"TDFXInitChips: numchips = %d\n", pTDFX->numChips);
638	638	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
639		- "TDFXInitChips: cfgbits = 0x%08lx, initbits = 0x%08lx\n",
	639	+ "TDFXInitChips: cfgbits = 0x%08x, initbits = 0x%08x\n",
640	640	cfgbits, initbits);
641	641	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
642		- "TDFXInitChips: mem0base = 0x%08lx, mem1base = 0x%08lx\n",
	642	+ "TDFXInitChips: mem0base = 0x%08x, mem1base = 0x%08x\n",
643	643	mem0base, mem1base);
644	644
645	645	mem0size = 32 * 1024 * 1024; /* Registers are always 32MB */
646	646	mem1size = pScrn->videoRam * 1024 * 2; /* Linear mapping is 2x memory */
647	647
648	648	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
649		- "TDFXInitChips: mem0size = 0x%08lx, mem1size = 0x%08lx\n",
	649	+ "TDFXInitChips: mem0size = 0x%08x, mem1size = 0x%08x\n",
650	650	mem0size, mem1size);
651	651
652	652	mem0bits = TDFXSizeToCfg(mem0size);
653	653	mem1bits = TDFXSizeToCfg(mem1size) << 4;
654	654
655	655	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
656		- "TDFXInitChips: mem0bits = 0x%08lx, mem1bits = 0x%08lx\n",
	656	+ "TDFXInitChips: mem0bits = 0x%08x, mem1bits = 0x%08x\n",
657	657	mem0bits, mem1bits);
658	658
659	659	cfgbits = (cfgbits & ~(0xFF)) | mem0bits | mem1bits;
660	660
661	661	xf86DrvMsgVerb(pScrn->scrnIndex, X_INFO, 3,
662		- "TDFXInitChips: cfgbits = 0x%08lx\n", cfgbits);
	662	+ "TDFXInitChips: cfgbits = 0x%08x\n", cfgbits);
663	663
664	664	for (i = 0; i < pTDFX->numChips; i++) {
665	665	PCI_WRITE_LONG(initbits | BIT(10), CFG_INIT_ENABLE, i);
...	...	@@ -753,7 +753,6 @@ Bool TDFXI2cInit(ScrnInfoPtr pScrn)
753	753	static xf86MonPtr doTDFXDDC(ScrnInfoPtr pScrn)
754	754	{
755	755	TDFXPtr pTDFX = TDFXPTR(pScrn);
756		- I2CBusPtr pI2CBus;
757	756	xf86MonPtr pMon = NULL;
758	757	CARD32 reg;
759	758
...	...	@@ -2215,9 +2214,6 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
2215	2214	TDFXPtr pTDFX;
2216	2215	VisualPtr visual;
2217	2216	BoxRec MemBox;
2218		-#ifdef TDFXDRI
2219		- MessageType driFrom = X_DEFAULT;
2220		-#endif
2221	2217	int scanlines;
2222	2218
2223	2219	TDFXTRACE("TDFXScreenInit start\n");
...	...	@@ -2325,15 +2321,12 @@ TDFXScreenInit(SCREEN_INIT_ARGS_DECL) {
2325	2321	#ifdef TDFXDRI
2326	2322	/*
2327	2323	* Setup DRI after visuals have been established, but before fbScreenInit
2328		- * is called. fbScreenInit will eventually call into the drivers
2329		- * InitGLXVisuals call back.
	2324	+ * is called.
2330	2325	*/
2331	2326	if (!xf86ReturnOptValBool(pTDFX->Options, OPTION_DRI, TRUE) || pTDFX->NoAccel) {
2332	2327	pTDFX->directRenderingEnabled = FALSE;
2333		- driFrom = X_CONFIG;
2334	2328	} else if (pTDFX->texSize < 0) {
2335	2329	pTDFX->directRenderingEnabled = FALSE;
2336		- driFrom = X_PROBED;
2337	2330	} else {
2338	2331	pTDFX->directRenderingEnabled = TDFXDRIScreenInit(pScreen);
2339	2332	}

src/tdfx_priv.c

---

...	...	@@ -240,11 +240,15 @@ void TDFXSwapContextFifo(ScreenPtr pScreen)
240	240	ScrnInfoPtr pScrn;
241	241	TDFXPtr pTDFX;
242	242	int dummy, readPos;
	243	+#if 0
243	244	TDFXSAREAPriv *sPriv;
	245	+#endif
244	246
245	247	pScrn = xf86ScreenToScrn(pScreen);
246	248	pTDFX=TDFXPTR(pScrn);
	249	+#if 0
247	250	sPriv=(TDFXSAREAPriv*)DRIGetSAREAPrivate(pScreen);
	251	+#endif
248	252	/* if (sPriv)
249	253	ErrorF("In FifoPtr=%d FifoRead=%d\n", sPriv->fifoPtr, sPriv->fifoRead); */
250	254	#if 1

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.