1 files changed, 0 insertions, 69 deletions
diff --git a/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c b/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
deleted file mode 100644
index 53b1a0e..0000000
--- a/x11-drivers/xf86-video-intel/files/extra-src_i915_render.c
+++ /dev/null
@@ -1,69 +0,0 @@
---- src/i915_render.c.orig	2009-05-12 19:12:11.000000000 -0500
-+++ src/i915_render.c	2010-03-07 15:30:45.000000000 -0600
-@@ -167,26 +167,8 @@
-     return TRUE;
- }
- 
--static Bool i915_check_composite_texture(PicturePtr pPict, int unit)
-+static Bool i915_check_composite_texture(ScrnInfoPtr pScrn, PicturePtr pPict, int unit)
- {
--    ScrnInfoPtr pScrn = xf86Screens[pPict->pDrawable->pScreen->myNum];
--    int w = pPict->pDrawable->width;
--    int h = pPict->pDrawable->height;
--    int i;
--
--    if ((w > 2048) || (h > 2048))
--        I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
--
--    for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
--	 i++)
--    {
--        if (i915_tex_formats[i].fmt == pPict->format)
--            break;
--    }
--    if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
--        I830FALLBACK("Unsupported picture format 0x%x\n",
--		     (int)pPict->format);
--
-     if (pPict->repeatType > RepeatReflect)
-         I830FALLBACK("Unsupported picture repeat %d\n", pPict->repeatType);
- 
-@@ -194,6 +176,26 @@
-         pPict->filter != PictFilterBilinear)
-         I830FALLBACK("Unsupported filter 0x%x\n", pPict->filter);
- 
-+    if (pPict->pDrawable)
-+    {
-+	int w, h, i;
-+
-+	w = pPict->pDrawable->width;
-+	h = pPict->pDrawable->height;
-+	if ((w > 2048) || (h > 2048))
-+	    I830FALLBACK("Picture w/h too large (%dx%d)\n", w, h);
-+
-+	for (i = 0; i < sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]);
-+	     i++)
-+	{
-+	    if (i915_tex_formats[i].fmt == pPict->format)
-+		break;
-+	}
-+	if (i == sizeof(i915_tex_formats) / sizeof(i915_tex_formats[0]))
-+	    I830FALLBACK("Unsupported picture format 0x%x\n",
-+			 (int)pPict->format);
-+    }
-+
-     return TRUE;
- }
- 
-@@ -220,9 +222,9 @@
- 			     "alpha and source value blending.\n");
-     }
- 
--    if (!i915_check_composite_texture(pSrcPicture, 0))
-+    if (!i915_check_composite_texture(pScrn, pSrcPicture, 0))
-         I830FALLBACK("Check Src picture texture\n");
--    if (pMaskPicture != NULL && !i915_check_composite_texture(pMaskPicture, 1))
-+    if (pMaskPicture != NULL && !i915_check_composite_texture(pScrn, pMaskPicture, 1))
-         I830FALLBACK("Check Mask picture texture\n");
- 
-     if (!i915_get_dest_format(pDstPicture, &tmp1))