[packages/xorg-xserver-server.git] / 110_nvidia_slowdow_fix.patch

diff -ru a/fb/fbpict.c b/fb/fbpict.c
--- a/fb/fbpict.c	2011-08-01 01:44:24.000000000 +0200
+++ b/fb/fbpict.c	2011-10-05 22:45:29.000000000 +0200
@@ -364,7 +364,7 @@
     ps->Glyphs = miGlyphs;
     ps->CompositeRects = miCompositeRects;
     ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
-    ps->Trapezoids = fbTrapezoids;
+    ps->Trapezoids = miTrapezoids;
     ps->AddTraps = fbAddTraps;
     ps->AddTriangles = fbAddTriangles;
     ps->Triangles = fbTriangles;
diff -ru a/render/mipict.c b/render/mipict.c
--- a/render/mipict.c	2011-04-04 05:19:50.000000000 +0200
+++ b/render/mipict.c	2011-10-05 22:02:53.000000000 +0200
@@ -573,6 +573,67 @@
     }
 }
 
+void
+miTrapezoids (CARD8	    op,
+	      PicturePtr    pSrc,
+	      PicturePtr    pDst,
+	      PictFormatPtr maskFormat,
+	      INT16	    xSrc,
+	      INT16	    ySrc,
+	      int	    ntrap,
+	      xTrapezoid    *traps)
+{
+    ScreenPtr		pScreen = pDst->pDrawable->pScreen;
+    PictureScreenPtr    ps = GetPictureScreen(pScreen);
+
+    /*
+     * Check for solid alpha add
+     */
+    if (op == PictOpAdd && miIsSolidAlpha (pSrc))
+    {
+	for (; ntrap; ntrap--, traps++)
+	    (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
+    } 
+    else if (maskFormat)
+    {
+	PicturePtr	pPicture;
+	BoxRec		bounds;
+	INT16		xDst, yDst;
+	INT16		xRel, yRel;
+	
+	xDst = traps[0].left.p1.x >> 16;
+	yDst = traps[0].left.p1.y >> 16;
+
+	miTrapezoidBounds (ntrap, traps, &bounds);
+	if (bounds.y1 >= bounds.y2 || bounds.x1 >= bounds.x2)
+	    return;
+	pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
+					 bounds.x2 - bounds.x1,
+					 bounds.y2 - bounds.y1);
+	if (!pPicture)
+	    return;
+	for (; ntrap; ntrap--, traps++)
+	    (*ps->RasterizeTrapezoid) (pPicture, traps, 
+				       -bounds.x1, -bounds.y1);
+	xRel = bounds.x1 + xSrc - xDst;
+	yRel = bounds.y1 + ySrc - yDst;
+	CompositePicture (op, pSrc, pPicture, pDst,
+			  xRel, yRel, 0, 0, bounds.x1, bounds.y1,
+			  bounds.x2 - bounds.x1,
+			  bounds.y2 - bounds.y1);
+	FreePicture (pPicture, 0);
+    }
+    else
+    {
+	if (pDst->polyEdge == PolyEdgeSharp)
+	    maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
+	else
+	    maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
+	for (; ntrap; ntrap--, traps++)
+	    miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
+    }
+}
+
 Bool
 miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
 {
@@ -656,7 +656,7 @@
     ps->Composite = 0;          /* requires DDX support */
     ps->Glyphs = miGlyphs;
     ps->CompositeRects = miCompositeRects;
-    ps->Trapezoids = 0;
+    ps->Trapezoids = miTrapezoids;
     ps->Triangles = 0;
 
     ps->RasterizeTrapezoid = 0; /* requires DDX support */
diff -ru a/render/mipict.h b/render/mipict.h
--- a/render/mipict.h	2011-04-04 05:19:50.000000000 +0200
+++ b/render/mipict.h	2011-10-05 22:06:19.000000000 +0200
@@ -129,6 +129,23 @@
 		      CARD32	    pixel,
 		      xRenderColor  *color);
 
+extern _X_EXPORT PicturePtr
+miCreateAlphaPicture (ScreenPtr	    pScreen, 
+		      PicturePtr    pDst,
+		      PictFormatPtr pPictFormat,
+		      CARD16	    width,
+		      CARD16	    height);
+
+extern _X_EXPORT void
+miTrapezoids (CARD8	    op,
+	      PicturePtr    pSrc,
+	      PicturePtr    pDst,
+	      PictFormatPtr maskFormat,
+	      INT16	    xSrc,
+	      INT16	    ySrc,
+	      int	    ntrap,
+	      xTrapezoid    *traps);
+
 extern _X_EXPORT Bool
 miIsSolidAlpha (PicturePtr pSrc);
 
diff -ru a/render/mitrap.c b/render/mitrap.c
--- a/render/mitrap.c	2011-04-04 05:19:50.000000000 +0200
+++ b/render/mitrap.c	2011-10-05 22:05:29.000000000 +0200
@@ -34,6 +34,55 @@
 #include "picturestr.h"
 #include "mipict.h"
 
+PicturePtr
+miCreateAlphaPicture (ScreenPtr	    pScreen, 
+		      PicturePtr    pDst,
+		      PictFormatPtr pPictFormat,
+		      CARD16	    width,
+		      CARD16	    height)
+{
+    PixmapPtr	    pPixmap;
+    PicturePtr	    pPicture;
+    GCPtr	    pGC;
+    int		    error;
+    xRectangle	    rect;
+
+    if (width > 32767 || height > 32767)
+	return 0;
+
+    if (!pPictFormat)
+    {
+	if (pDst->polyEdge == PolyEdgeSharp)
+	    pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
+	else
+	    pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
+	if (!pPictFormat)
+	    return 0;
+    }
+
+    pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height, 
+					pPictFormat->depth, 0);
+    if (!pPixmap)
+	return 0;
+    pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
+    if (!pGC)
+    {
+	(*pScreen->DestroyPixmap) (pPixmap);
+	return 0;
+    }
+    ValidateGC (&pPixmap->drawable, pGC);
+    rect.x = 0;
+    rect.y = 0;
+    rect.width = width;
+    rect.height = height;
+    (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
+    FreeScratchGC (pGC);
+    pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
+			      0, 0, serverClient, &error);
+    (*pScreen->DestroyPixmap) (pPixmap);
+    return pPicture;
+}
+
 static xFixed
 miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
 {
Commit	Line	Data
1ce4cc3d JR	1	diff -ru a/fb/fbpict.c b/fb/fbpict.c
	2	--- a/fb/fbpict.c 2011-08-01 01:44:24.000000000 +0200
	3	+++ b/fb/fbpict.c 2011-10-05 22:45:29.000000000 +0200
	4	@@ -364,7 +364,7 @@
	5	ps->Glyphs = miGlyphs;
	6	ps->CompositeRects = miCompositeRects;
	7	ps->RasterizeTrapezoid = fbRasterizeTrapezoid;
	8	- ps->Trapezoids = fbTrapezoids;
	9	+ ps->Trapezoids = miTrapezoids;
	10	ps->AddTraps = fbAddTraps;
	11	ps->AddTriangles = fbAddTriangles;
	12	ps->Triangles = fbTriangles;
	13	diff -ru a/render/mipict.c b/render/mipict.c
	14	--- a/render/mipict.c 2011-04-04 05:19:50.000000000 +0200
	15	+++ b/render/mipict.c 2011-10-05 22:02:53.000000000 +0200
	16	@@ -573,6 +573,67 @@
	17	}
	18	}
	19
	20	+void
	21	+miTrapezoids (CARD8 op,
	22	+ PicturePtr pSrc,
	23	+ PicturePtr pDst,
	24	+ PictFormatPtr maskFormat,
	25	+ INT16 xSrc,
	26	+ INT16 ySrc,
	27	+ int ntrap,
	28	+ xTrapezoid *traps)
	29	+{
	30	+ ScreenPtr pScreen = pDst->pDrawable->pScreen;
	31	+ PictureScreenPtr ps = GetPictureScreen(pScreen);
	32	+
	33	+ /*
	34	+ * Check for solid alpha add
	35	+ */
	36	+ if (op == PictOpAdd && miIsSolidAlpha (pSrc))
	37	+ {
	38	+ for (; ntrap; ntrap--, traps++)
	39	+ (*ps->RasterizeTrapezoid) (pDst, traps, 0, 0);
	40	+ }
	41	+ else if (maskFormat)
	42	+ {
	43	+ PicturePtr pPicture;
	44	+ BoxRec bounds;
	45	+ INT16 xDst, yDst;
	46	+ INT16 xRel, yRel;
	47	+
	48	+ xDst = traps[0].left.p1.x >> 16;
	49	+ yDst = traps[0].left.p1.y >> 16;
	50	+
	51	+ miTrapezoidBounds (ntrap, traps, &bounds);
	52	+ if (bounds.y1 >= bounds.y2 \|\| bounds.x1 >= bounds.x2)
	53	+ return;
	54	+ pPicture = miCreateAlphaPicture (pScreen, pDst, maskFormat,
	55	+ bounds.x2 - bounds.x1,
	56	+ bounds.y2 - bounds.y1);
	57	+ if (!pPicture)
	58	+ return;
	59	+ for (; ntrap; ntrap--, traps++)
	60	+ (*ps->RasterizeTrapezoid) (pPicture, traps,
	61	+ -bounds.x1, -bounds.y1);
	62	+ xRel = bounds.x1 + xSrc - xDst;
	63	+ yRel = bounds.y1 + ySrc - yDst;
	64	+ CompositePicture (op, pSrc, pPicture, pDst,
65	+ xRel, yRel, 0, 0, bounds.x1, bounds.y1,
66	+ bounds.x2 - bounds.x1,
67	+ bounds.y2 - bounds.y1);
68	+ FreePicture (pPicture, 0);
69	+ }
70	+ else
71	+ {
72	+ if (pDst->polyEdge == PolyEdgeSharp)
73	+ maskFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
74	+ else
75	+ maskFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
76	+ for (; ntrap; ntrap--, traps++)
77	+ miTrapezoids (op, pSrc, pDst, maskFormat, xSrc, ySrc, 1, traps);
78	+ }
79	+}
80	+
81	Bool
82	miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats)
83	{
0c36d11c AM	84	@@ -656,7 +656,7 @@
	85	ps->Composite = 0; /* requires DDX support */
	86	ps->Glyphs = miGlyphs;
	87	ps->CompositeRects = miCompositeRects;
	88	- ps->Trapezoids = 0;
	89	+ ps->Trapezoids = miTrapezoids;
	90	ps->Triangles = 0;
	91
	92	ps->RasterizeTrapezoid = 0; /* requires DDX support */
1ce4cc3d JR	93	diff -ru a/render/mipict.h b/render/mipict.h
	94	--- a/render/mipict.h 2011-04-04 05:19:50.000000000 +0200
	95	+++ b/render/mipict.h 2011-10-05 22:06:19.000000000 +0200
	96	@@ -129,6 +129,23 @@
	97	CARD32 pixel,
	98	xRenderColor *color);
	99
	100	+extern _X_EXPORT PicturePtr
	101	+miCreateAlphaPicture (ScreenPtr pScreen,
	102	+ PicturePtr pDst,
	103	+ PictFormatPtr pPictFormat,
	104	+ CARD16 width,
	105	+ CARD16 height);
	106	+
	107	+extern _X_EXPORT void
	108	+miTrapezoids (CARD8 op,
	109	+ PicturePtr pSrc,
	110	+ PicturePtr pDst,
	111	+ PictFormatPtr maskFormat,
	112	+ INT16 xSrc,
	113	+ INT16 ySrc,
	114	+ int ntrap,
	115	+ xTrapezoid *traps);
	116	+
	117	extern _X_EXPORT Bool
	118	miIsSolidAlpha (PicturePtr pSrc);
	119
	120	diff -ru a/render/mitrap.c b/render/mitrap.c
	121	--- a/render/mitrap.c 2011-04-04 05:19:50.000000000 +0200
	122	+++ b/render/mitrap.c 2011-10-05 22:05:29.000000000 +0200
	123	@@ -34,6 +34,55 @@
	124	#include "picturestr.h"
	125	#include "mipict.h"
	126
	127	+PicturePtr
	128	+miCreateAlphaPicture (ScreenPtr pScreen,
	129	+ PicturePtr pDst,
	130	+ PictFormatPtr pPictFormat,
	131	+ CARD16 width,
	132	+ CARD16 height)
	133	+{
	134	+ PixmapPtr pPixmap;
	135	+ PicturePtr pPicture;
	136	+ GCPtr pGC;
	137	+ int error;
	138	+ xRectangle rect;
	139	+
	140	+ if (width > 32767 \|\| height > 32767)
	141	+ return 0;
	142	+
	143	+ if (!pPictFormat)
	144	+ {
	145	+ if (pDst->polyEdge == PolyEdgeSharp)
	146	+ pPictFormat = PictureMatchFormat (pScreen, 1, PICT_a1);
	147	+ else
	148	+ pPictFormat = PictureMatchFormat (pScreen, 8, PICT_a8);
	149	+ if (!pPictFormat)
	150	+ return 0;
	151	+ }
	152	+
	153	+ pPixmap = (*pScreen->CreatePixmap) (pScreen, width, height,
	154	+ pPictFormat->depth, 0);
	155	+ if (!pPixmap)
	156	+ return 0;
157	+ pGC = GetScratchGC (pPixmap->drawable.depth, pScreen);
158	+ if (!pGC)
159	+ {
160	+ (*pScreen->DestroyPixmap) (pPixmap);
161	+ return 0;
162	+ }
163	+ ValidateGC (&pPixmap->drawable, pGC);
164	+ rect.x = 0;
165	+ rect.y = 0;
166	+ rect.width = width;
167	+ rect.height = height;
168	+ (*pGC->ops->PolyFillRect)(&pPixmap->drawable, pGC, 1, &rect);
169	+ FreeScratchGC (pGC);
170	+ pPicture = CreatePicture (0, &pPixmap->drawable, pPictFormat,
171	+ 0, 0, serverClient, &error);
172	+ (*pScreen->DestroyPixmap) (pPixmap);
173	+ return pPicture;
174	+}
175	+
176	static xFixed
177	miLineFixedX (xLineFixed *l, xFixed y, Bool ceil)
178	{
179