xserver: Branch 'master'

[Adam Jackson]

 glx/rensize.c |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit c877048c8509a03f6aa69e533ab86c1039cfb6df
Author: Jon TURNEY <jon.turney at dronecode.org.uk>
Date:   Thu Jun 30 15:30:40 2011 +0100

    glx: Synchronize Xserver glx/rensize.c with mesa src/glx/compsize.c
    
    Noticed while investigating https://bugs.freedesktop.org/show_bug.cgi?id=30102
    
    Reviewed-by: Adam Jackson <ajax at redhat.com>
    Signed-off-by: Jon TURNEY <jon.turney at dronecode.org.uk>

diff --git a/glx/rensize.c b/glx/rensize.c
index 6bfe99b..55ad4a2 100644
--- a/glx/rensize.c
+++ b/glx/rensize.c
@@ -240,6 +240,7 @@ __glXImageSize(GLenum format, GLenum type, GLenum target,
         case GL_422_REV_AVERAGE_EXT:
         case GL_DEPTH_STENCIL_NV:
         case GL_DEPTH_STENCIL_MESA:
+        case GL_YCBCR_422_APPLE:
         case GL_YCBCR_MESA:
         case GL_LUMINANCE_ALPHA:
         case GL_LUMINANCE_ALPHA_INTEGER_EXT: