From b45f86f25590366d4dd6422555eb8a42a54551e8 Mon Sep 17 00:00:00 2001
From: David Reveman <c99drn@cs.umu.se>
Date: Fri, 31 Mar 2006 02:41:20 +0000
Subject: [PATCH] Do not return YUV formats

---
 ChangeLog       |  5 +++++
 render/render.c | 15 +++++++++++++--
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5f96e834d..593e3782a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-03-31  David Reveman  <davidr@novell.com>
+
+	* render/render.c (ProcRenderQueryPictFormats): Do not return YUV
+	formats.
+
 2006-03-30  David Reveman  <davidr@novell.com>
 
 	* hw/xgl/glx/xglx.c: Move XOpenDisplay and GLX initialization
diff --git a/render/render.c b/render/render.c
index d18b6580a..603fb61ae 100644
--- a/render/render.c
+++ b/render/render.c
@@ -1,4 +1,4 @@
-/* $XdotOrg: xserver/xorg/render/render.c,v 1.12.8.1 2006/01/18 07:21:43 airlied Exp $ */
+/* $XdotOrg: xserver/xorg/render/render.c,v 1.12.8.2 2006/03/30 16:39:30 davidr Exp $ */
 /*
  * $XFree86: xc/programs/Xserver/render/render.c,v 1.27tsi Exp $
  *
@@ -386,7 +386,14 @@ ProcRenderQueryPictFormats (ClientPtr client)
 	}
 	ps = GetPictureScreenIfSet(pScreen);
 	if (ps)
-	    nformat += ps->nformats;
+	{
+	    for (d = 0; d < ps->nformats; d++)
+	    {
+		if (ps->formats[d].type == PictTypeIndexed ||
+		    ps->formats[d].type == PictTypeDirect)
+		    nformat++;
+	    }
+	}
     }
     if (pRenderClient->major_version == 0 && pRenderClient->minor_version < 6)
 	numSubpixel = 0;
@@ -423,6 +430,10 @@ ProcRenderQueryPictFormats (ClientPtr client)
 		 nformat < ps->nformats;
 		 nformat++, pFormat++)
 	    {
+		if (pFormat->type != PictTypeIndexed &&
+		    pFormat->type != PictTypeDirect)
+		    continue;
+
 		pictForm->id = pFormat->id;
 		pictForm->type = pFormat->type;
 		pictForm->depth = pFormat->depth;