Merge remote-tracking branch 'origin/released'

Conflicts:
	apps/xwininfo/configure.ac
	apps/xwininfo/xwininfo.c
	libX11/configure.ac
	libX11/specs/libX11/AppC.xml
	libX11/specs/libX11/AppD.xml
	libX11/specs/libX11/CH03.xml
	libX11/specs/libX11/CH04.xml
	libX11/specs/libX11/CH05.xml
	libX11/specs/libX11/CH06.xml
	libX11/specs/libX11/CH07.xml
	libX11/specs/libX11/CH08.xml
	libX11/specs/libX11/CH09.xml
	libX11/specs/libX11/CH11.xml
	libX11/specs/libX11/CH12.xml
	libX11/specs/libX11/CH13.xml
	libX11/specs/libX11/CH14.xml
	libX11/specs/libX11/CH15.xml
	libX11/specs/libX11/CH16.xml
	libxcb/configure.ac
	libxcb/src/c_client.py
	libxcb/src/xcb_auth.c
	libxcb/src/xcb_util.c
	mesalib/common.py
	mesalib/configs/linux-dri
	mesalib/docs/GL3.txt
	mesalib/docs/download.html
	mesalib/docs/install.html
	mesalib/include/GL/internal/dri_interface.h
	mesalib/scons/custom.py
	mesalib/scons/gallium.py
	mesalib/src/gallium/auxiliary/util/u_math.h
	mesalib/src/gallium/auxiliary/util/u_vbuf_mgr.c
	mesalib/src/glsl/ast_function.cpp
	mesalib/src/glsl/ast_to_hir.cpp
	mesalib/src/glsl/glcpp/glcpp-parse.y
	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_clone.cpp
	mesalib/src/glsl/ir_print_visitor.cpp
	mesalib/src/glsl/ir_validate.cpp
	mesalib/src/glsl/linker.cpp
	mesalib/src/glsl/main.cpp
	mesalib/src/glsl/opt_tree_grafting.cpp
	mesalib/src/mapi/glapi/gen/Makefile
	mesalib/src/mapi/glapi/gen/gl_XML.py
	mesalib/src/mapi/glapi/gen/gl_table.py
	mesalib/src/mapi/glapi/glapi_mapi_tmp.h
	mesalib/src/mapi/glapi/glapi_sparc.S
	mesalib/src/mapi/glapi/glapi_x86-64.S
	mesalib/src/mapi/glapi/glapi_x86.S
	mesalib/src/mapi/glapi/glapitemp.h
	mesalib/src/mapi/glapi/glprocs.h
	mesalib/src/mapi/mapi/u_thread.c
	mesalib/src/mapi/mapi/u_thread.h
	mesalib/src/mesa/SConscript
	mesalib/src/mesa/drivers/common/driverfuncs.c
	mesalib/src/mesa/drivers/windows/gldirect/dglcontext.c
	mesalib/src/mesa/main/api_arrayelt.c
	mesalib/src/mesa/main/bufferobj.c
	mesalib/src/mesa/main/compiler.h
	mesalib/src/mesa/main/dd.h
	mesalib/src/mesa/main/dlist.c
	mesalib/src/mesa/main/enums.c
	mesalib/src/mesa/main/es_generator.py
	mesalib/src/mesa/main/fbobject.c
	mesalib/src/mesa/main/imports.h
	mesalib/src/mesa/main/mtypes.h
	mesalib/src/mesa/main/pbo.c
	mesalib/src/mesa/main/remap_helper.h
	mesalib/src/mesa/main/shared.c
	mesalib/src/mesa/main/texgetimage.c
	mesalib/src/mesa/main/teximage.c
	mesalib/src/mesa/main/uniforms.c
	mesalib/src/mesa/program/ir_to_mesa.cpp
	mesalib/src/mesa/program/prog_optimize.c
	mesalib/src/mesa/program/register_allocate.c
	mesalib/src/mesa/program/register_allocate.h
	mesalib/src/mesa/sources.mak
	mesalib/src/mesa/state_tracker/st_cb_bufferobjects.c
	mesalib/src/mesa/state_tracker/st_cb_texture.c
	mesalib/src/mesa/state_tracker/st_texture.h
	mesalib/src/mesa/swrast/s_context.c
	mesalib/src/mesa/tnl/t_draw.c
	mesalib/src/mesa/vbo/vbo_exec_array.c
	mesalib/src/mesa/vbo/vbo_save_api.c
	pixman/pixman/pixman-arm-common.h
	pixman/pixman/pixman-fast-path.c
	pixman/pixman/pixman-inlines.h
	pixman/test/Makefile.am
	pixman/test/utils.c
	pixman/test/utils.h
	xorg-server/configure.ac
	xorg-server/fb/fbblt.c
	xorg-server/hw/xquartz/darwin.c
	xorg-server/xkeyboard-config/symbols/de

1 files changed, 67 insertions, 15 deletions

diff --git a/mesalib/src/mesa/main/fbobject.c b/mesalib/src/mesa/main/fbobject.c
index 7c31d2577..aa38bdd41 100644
--- a/mesalib/src/mesa/main/fbobject.c
+++ b/mesalib/src/mesa/main/fbobject.c
@@ -1984,10 +1984,26 @@ _mesa_FramebufferTexture1DEXT(GLenum target, GLenum attachment,
 {

    GET_CURRENT_CONTEXT(ctx);

 

-   if ((texture != 0) && (textarget != GL_TEXTURE_1D)) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

-                  "glFramebufferTexture1DEXT(textarget)");

-      return;

+   if (texture != 0) {

+      GLboolean error;

+

+      switch (textarget) {

+      case GL_TEXTURE_1D:

+         error = GL_FALSE;

+         break;

+      case GL_TEXTURE_1D_ARRAY:

+         error = !ctx->Extensions.EXT_texture_array;

+         break;

+      default:

+         error = GL_TRUE;

+      }

+

+      if (error) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glFramebufferTexture1DEXT(textarget=%s)",

+                     _mesa_lookup_enum_by_nr(textarget));

+         return;

+      }

    }

 

    framebuffer_texture(ctx, "1D", target, attachment, textarget, texture,

@@ -2001,13 +2017,37 @@ _mesa_FramebufferTexture2DEXT(GLenum target, GLenum attachment,
 {

    GET_CURRENT_CONTEXT(ctx);

 

-   if ((texture != 0) &&

-       (textarget != GL_TEXTURE_2D) &&

-       (textarget != GL_TEXTURE_RECTANGLE_ARB) &&

-       (!is_cube_face(textarget))) {

-      _mesa_error(ctx, GL_INVALID_OPERATION,

-                  "glFramebufferTexture2DEXT(textarget=0x%x)", textarget);

-      return;

+   if (texture != 0) {

+      GLboolean error;

+

+      switch (textarget) {

+      case GL_TEXTURE_2D:

+         error = GL_FALSE;

+         break;

+      case GL_TEXTURE_RECTANGLE:

+         error = !ctx->Extensions.NV_texture_rectangle;

+         break;

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_X:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_X:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Y:

+      case GL_TEXTURE_CUBE_MAP_POSITIVE_Z:

+      case GL_TEXTURE_CUBE_MAP_NEGATIVE_Z:

+         error = !ctx->Extensions.ARB_texture_cube_map;

+         break;

+      case GL_TEXTURE_2D_ARRAY:

+         error = !ctx->Extensions.EXT_texture_array;

+         break;

+      default:

+         error = GL_FALSE;

+      }

+

+      if (error) {

+         _mesa_error(ctx, GL_INVALID_OPERATION,

+                     "glFramebufferTexture2DEXT(textarget=%s)",

+                     _mesa_lookup_enum_by_nr(textarget));

+         return;

+      }

    }

 

    framebuffer_texture(ctx, "2D", target, attachment, textarget, texture,

@@ -2023,7 +2063,7 @@ _mesa_FramebufferTexture3DEXT(GLenum target, GLenum attachment,
    GET_CURRENT_CONTEXT(ctx);

 

    if ((texture != 0) && (textarget != GL_TEXTURE_3D)) {

-      _mesa_error(ctx, GL_INVALID_ENUM,

+      _mesa_error(ctx, GL_INVALID_OPERATION,

                   "glFramebufferTexture3DEXT(textarget)");

       return;

    }

@@ -2346,6 +2386,8 @@ void GLAPIENTRY
 _mesa_GenerateMipmapEXT(GLenum target)

 {

    struct gl_texture_object *texObj;

+   GLboolean error;

+

    GET_CURRENT_CONTEXT(ctx);

 

    ASSERT_OUTSIDE_BEGIN_END(ctx);

@@ -2355,12 +2397,22 @@ _mesa_GenerateMipmapEXT(GLenum target)
    case GL_TEXTURE_1D:

    case GL_TEXTURE_2D:

    case GL_TEXTURE_3D:

+      error = GL_FALSE;

+      break;

    case GL_TEXTURE_CUBE_MAP:

-      /* OK, legal value */

+      error = !ctx->Extensions.ARB_texture_cube_map;

+      break;

+   case GL_TEXTURE_1D_ARRAY:

+   case GL_TEXTURE_2D_ARRAY:

+      error = !ctx->Extensions.EXT_texture_array;

       break;

    default:

-      /* XXX need to implement GL_TEXTURE_1D_ARRAY and GL_TEXTURE_2D_ARRAY */

-      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target)");

+      error = GL_TRUE;

+   }

+

+   if (error) {

+      _mesa_error(ctx, GL_INVALID_ENUM, "glGenerateMipmapEXT(target=%s)",

+                  _mesa_lookup_enum_by_nr(target));

       return;

    }