Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	libX11/configure.ac
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glsl_parser_extras.cpp
	mesalib/src/glsl/glsl_parser_extras.h
	mesalib/src/glsl/ir.cpp
	mesalib/src/glsl/ir.h
	mesalib/src/glsl/ir_constant_expression.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/lower_mat_op_to_vec.cpp
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/state_tracker/st_cb_drawpixels.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_context.h
	mesalib/src/mesa/state_tracker/st_format.h
	mkfontscale/configure.ac
	xorg-server/Xext/xvmc.c
	xorg-server/configure.ac
	xorg-server/dix/Makefile.am
	xorg-server/fb/fbarc.c
	xorg-server/fb/fbgc.c
	xorg-server/glx/glapi_gentable.c
	xorg-server/glx/glxdri2.c
	xorg-server/glx/glxscreens.c
	xorg-server/hw/xfree86/Makefile.am
	xorg-server/hw/xfree86/loader/Makefile.am
	xorg-server/hw/xquartz/X11Application.m
	xorg-server/hw/xquartz/mach-startup/Makefile.am
	xorg-server/hw/xwin/XWin.rc
	xorg-server/hw/xwin/winmultiwindowwindow.c
	xorg-server/hw/xwin/winmultiwindowwndproc.c
	xorg-server/os/Makefile.am
	xorg-server/test/Makefile.am
	xorg-server/xfixes/region.c
	xorg-server/xkeyboard-config/symbols/ma

1 files changed, 6 insertions, 5 deletions

diff --git a/xorg-server/Xext/xvmc.c b/xorg-server/Xext/xvmc.c
index 0a0e9415e..c3354ecef 100644
--- a/xorg-server/Xext/xvmc.c
+++ b/xorg-server/Xext/xvmc.c
@@ -487,8 +487,8 @@ ProcXvMCListSubpictureTypes(ClientPtr client)
 

     pScreen = pPort->pAdaptor->pScreen;

 

-    if(XvMCScreenKey == NULL) /* No XvMC adaptors */

-        return BadMatch;

+    if (!dixPrivateKeyRegistered(XvMCScreenKey))

+        return BadMatch;   /* No XvMC adaptors */

 

     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen)))

         return BadMatch;   /* None this screen */

@@ -668,8 +668,8 @@ XvMCExtensionInit(void)
 {

    ExtensionEntry *extEntry;

 

-   if(XvMCScreenKey == NULL) /* nobody supports it */

-	return; 

+   if (!dixPrivateKeyRegistered(XvMCScreenKey))

+	return;

 

    if(!(XvMCRTContext = CreateNewResourceType(XvMCDestroyContextRes,

 					      "XvMCRTContext")))

@@ -746,7 +746,8 @@ XvImagePtr XvMCFindXvImage(XvPortPtr pPort, CARD32 id)
     XvMCAdaptorPtr adaptor = NULL;

     int i;

 

-    if(XvMCScreenKey == NULL) return NULL;

+    if (!dixPrivateKeyRegistered(XvMCScreenKey))

+        return NULL;

 

     if(!(pScreenPriv = XVMC_GET_PRIVATE(pScreen))) 

         return NULL;