Merge remote-tracking branch 'origin/released'

Conflicts:
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/glsl_types.cpp
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/texparam.c
	xorg-server/config/udev.c
	xorg-server/configure.ac
	xorg-server/dix/main.c
	xorg-server/hw/dmx/dmxinit.c
	xorg-server/hw/kdrive/src/kdrive.c
	xorg-server/hw/xfree86/common/xf86Config.c
	xorg-server/hw/xfree86/common/xf86Configure.c
	xorg-server/hw/xfree86/common/xf86Helper.c
	xorg-server/hw/xfree86/common/xf86Init.c
	xorg-server/hw/xfree86/common/xf86Option.c
	xorg-server/hw/xfree86/common/xf86Priv.h
	xorg-server/hw/xfree86/common/xf86Xinput.c
	xorg-server/hw/xnest/Init.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/hw/xwin/InitOutput.c
	xorg-server/hw/xwin/winerror.c
	xorg-server/hw/xwin/xlaunch/config.cc
	xorg-server/hw/xwin/xlaunch/config.h
	xorg-server/hw/xwin/xlaunch/main.cc
	xorg-server/hw/xwin/xlaunch/resources/dialog.rc
	xorg-server/hw/xwin/xlaunch/resources/resources.h
	xorg-server/hw/xwin/xlaunch/resources/resources.rc
	xorg-server/hw/xwin/xlaunch/resources/strings.rc
	xorg-server/hw/xwin/xlaunch/window/util.cc
	xorg-server/hw/xwin/xlaunch/window/util.h
	xorg-server/hw/xwin/xlaunch/window/wizard.h
	xorg-server/include/os.h
	xorg-server/os/log.c
	xorg-server/xkeyboard-config/symbols/lv

2 files changed, 10 insertions, 13 deletions

diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 7141efba1..1cca7d90e 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1,6 +1,5 @@
 /*

- * mesa 3-D graphics library

- * Version:  7.6

+ * Mesa 3-D graphics library

  *

  * Copyright (C) 1999-2008  Brian Paul   All Rights Reserved.

  * Copyright (C) 2009  VMware, Inc.  All Rights Reserved.

@@ -556,8 +555,6 @@ _mesa_tex_target_to_face(GLenum target)
  * \param target texture target.

  * \param level image level.

  * \param texImage texture image.

- * 

- * This was basically prompted by the introduction of cube maps.

  */

 void

 _mesa_set_tex_image(struct gl_texture_object *tObj,

@@ -709,15 +706,13 @@ get_proxy_target(GLenum target)
 

 /**

  * Get the texture object that corresponds to the target of the given

- * texture unit.

+ * texture unit.  The target should have already been checked for validity.

  *

  * \param ctx GL context.

  * \param texUnit texture unit.

  * \param target texture target.

  *

  * \return pointer to the texture object on success, or NULL on failure.

- * 

- * \sa gl_texture_unit.

  */

 struct gl_texture_object *

 _mesa_select_tex_object(struct gl_context *ctx,

diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c
index 1e51782d7..1bb5b6e78 100644
--- a/mesalib/src/mesa/main/texparam.c
+++ b/mesalib/src/mesa/main/texparam.c
@@ -1266,12 +1266,13 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params )
          break;

 

       case GL_TEXTURE_CUBE_MAP_SEAMLESS:

-      if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {

-         *params = (GLfloat) obj->Sampler.CubeMapSeamless;

-      }

-      else {

-         error = GL_TRUE;

-      }

+         if (ctx->Extensions.AMD_seamless_cubemap_per_texture) {

+            *params = (GLfloat) obj->Sampler.CubeMapSeamless;

+         }

+         else {

+            error = GL_TRUE;

+         }

+         break;

 

       default:

 	 error = GL_TRUE;

@@ -1441,6 +1442,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params )
          else {

             error = GL_TRUE;

          }

+         break;

 

       default:

          ; /* silence warnings */