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, 0 insertions, 198 deletions

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/dglglobals.h b/mesalib/src/mesa/drivers/windows/gldirect/dglglobals.h
deleted file mode 100644
index 995f1cd5e..000000000
--- a/mesalib/src/mesa/drivers/windows/gldirect/dglglobals.h
+++ /dev/null
@@ -1,198 +0,0 @@
-/****************************************************************************
-*
-*                        Mesa 3-D graphics library
-*                        Direct3D Driver Interface
-*
-*  ========================================================================
-*
-*   Copyright (C) 1991-2004 SciTech Software, Inc. All rights reserved.
-*
-*   Permission is hereby granted, free of charge, to any person obtaining a
-*   copy of this software and associated documentation files (the "Software"),
-*   to deal in the Software without restriction, including without limitation
-*   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-*   and/or sell copies of the Software, and to permit persons to whom the
-*   Software is furnished to do so, subject to the following conditions:
-*
-*   The above copyright notice and this permission notice shall be included
-*   in all copies or substantial portions of the Software.
-*
-*   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-*   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-*   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-*   SCITECH SOFTWARE INC BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-*   WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF
-*   OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-*   SOFTWARE.
-*
-*  ======================================================================
-*
-* Language:     ANSI C
-* Environment:  Windows 9x (Win32)
-*
-* Description:  Globals.
-*
-****************************************************************************/
-
-#ifndef __DGLGLOBALS_H
-#define __DGLGLOBALS_H
-
-#include "dglcontext.h"
-#include "dglpf.h"		// Pixel format
-#ifndef _USE_GLD3_WGL
-#include "d3dtexture.h"
-#endif
-
-/*---------------------- Macros and type definitions ----------------------*/
-
-typedef enum {
-	DGL_RENDER_MESASW		= 0,
-	DGL_RENDER_D3D			= 1,
-	DGL_RENDER_FORCE_DWORD	= 0x7ffffff,
-} DGL_renderType;
-
-#ifdef _USE_GLD3_WGL
-
-// Same as DGL_renderType? KeithH
-typedef enum {
-	GLDS_DRIVER_MESA_SW			= 0,	// Mesa SW rendering
-	GLDS_DRIVER_REF				= 1,	// Direct3D Reference Rasteriser
-	GLDS_DRIVER_HAL				= 2,	// Direct3D HW rendering
-} GLDS_DRIVER;
-
-typedef enum {
-	GLDS_TNL_DEFAULT			= 0,	// Choose best TnL method
-	GLDS_TNL_MESA				= 1,	// Mesa TnL
-	GLDS_TNL_D3DSW				= 2,	// D3D Software TnL
-	GLDS_TNL_D3DHW				= 3,	// D3D Hardware TnL
-} GLDS_TNL;
-
-typedef enum {
-	GLDS_MULTISAMPLE_NONE		= 0,
-	GLDS_MULTISAMPLE_FASTEST	= 1,
-	GLDS_MULTISAMPLE_NICEST		= 2,
-} GLDS_MULTISAMPLE;
-#endif
-
-typedef struct {
-	// Registry settings
-	char				szDDName[MAX_DDDEVICEID_STRING]; // DirectDraw device name
-	char				szD3DName[MAX_DDDEVICEID_STRING]; // Direct3D driver name
-	BOOL				bPrimary; // Is ddraw device the Primary device?
-	BOOL				bHardware; // Is the d3d driver a Hardware driver?
-#ifndef _USE_GLD3_WGL
-	GUID				ddGuid; // GUID of the ddraw device 
-	GUID				d3dGuid; // GUID of the direct3d driver
-#endif // _USE_GLD3_WGL
-//	BOOL				bFullscreen; // Force fullscreen - only useful for primary adaptors.
-	BOOL				bSquareTextures; // Does this driver require square textures?
-	DWORD               dwRendering; // Type of rendering required
-
-	BOOL				bWaitForRetrace; // Sync to vertical retrace
-	BOOL				bFullscreenBlit; // Use Blt instead of Flip in fullscreen modes
-
-	// Multitexture
-	BOOL				bMultitexture;
-
-	BOOL				bUseMipmaps;
-
-	DWORD				dwMemoryType; // Sysmem or Vidmem
-
-	// Global palette
-	BOOL				bPAL8;
-	DDPIXELFORMAT		ddpfPAL8;
-
-	// Multitexture
-	WORD				wMaxSimultaneousTextures;
-
-	// Win32 internals
-	BOOL				bAppActive; // Keep track of Alt-Tab
-	LONG				lpfnWndProc; // WndProc of calling app
-
-	// Pixel Format Descriptior list.
-	int					nPixelFormatCount;
-	DGL_pixelFormat		*lpPF;
-#ifndef _USE_GLD3_WGL
-	// ZBuffer pixel formats
-	int					nZBufferPFCount; // Count of Zbuffer pixel formats
-	DDPIXELFORMAT		*lpZBufferPF; // ZBuffer pixel formats
-
-	// Display modes (for secondary devices)
-	int					nDisplayModeCount;
-	DDSURFACEDESC2		*lpDisplayModes;
-
-	// Texture pixel formats
-	int					nTextureFormatCount;
-	DGL_textureFormat	*lpTextureFormat;
-#endif // _USE_GLD3_WGL
-	// Alpha emulation via chroma key
-	BOOL				bEmulateAlphaTest;
-
-	// Geom pipeline override.
-	// If this is set TRUE then the D3D pipeline will never be used,
-	// and the Mesa pipline will always be used.
-	BOOL				bForceMesaPipeline;
-
-#ifdef _USE_GLD3_WGL
-	BOOL				bPixelformatsDirty;	// Signal a list rebuild
-#endif
-
-	// Additional globals to support multiple GL rendering contexts, GLRCs
-	BOOL				bDirectDraw;			// DirectDraw interface exists ?
-	BOOL				bDirectDrawPrimary;		// DirectDraw primary surface exists ?
-	BOOL				bDirect3D;				// Direct3D interface exists ?
-	BOOL				bDirect3DDevice;		// Direct3D device exists ?
-
-	BOOL 				bDirectDrawStereo;		// DirectDraw Stereo driver started ?
-	int 				iDirectDrawStereo;		// DirectDraw Stereo driver reference count
-	HWND				hWndActive;				// copy of active window
-
-    // Copies of DirectX COM interfaces for re-referencing across multiple GLRCs
-//	IDirectDraw4			*lpDD4;				// copy of DirectDraw interface
-//	IDirectDrawSurface4		*lpPrimary4;		// copy of DirectDraw primary surface
-//	IDirectDrawSurface4		*lpBack4;
-//	IDirectDrawSurface4		*lpDepth4;
-//	IDirectDrawPalette		*lpGlobalPalette;
-
-	// Aids for heavy-duty MFC-windowed OGL apps, like AutoCAD
-	BOOL				bMessageBoxWarnings;	// popup message box warning
-	BOOL				bDirectDrawPersistant;  // DirectDraw is persisitant
-	BOOL				bPersistantBuffers;  	// DirectDraw buffers persisitant
-
-	// FPU setup option for CAD precision (AutoCAD) vs GAME speed (Quake)
-	BOOL				bFastFPU;				// single-precision-only FPU ?
-
-	// Hot-Key support, like for real-time stereo parallax adjustments
-	BOOL				bHotKeySupport;			// hot-key support ?
-
-	// Multi-threaded support, for apps like 3DStudio
-	BOOL				bMultiThreaded;			// multi-threaded ?
-
-	// Detect and use app-specific customizations for apps like 3DStudio
-	BOOL				bAppCustomizations;		// app customizations ?
-
-#ifdef _USE_GLD3_WGL
-	DWORD				dwAdapter;				// Primary DX8 adapter
-	DWORD				dwTnL;					// MesaSW TnL
-	DWORD				dwMultisample;			// Multisample Off
-	DWORD				dwDriver;				// Direct3D HW
-	void				*pDrvPrivate;			// Driver-specific data
-#endif
-
-} DGL_globals;
-
-/*------------------------- Function Prototypes ---------------------------*/
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-DGL_globals	glb;
-
-void		dglInitGlobals();
-
-#ifdef  __cplusplus
-}
-#endif
-
-#endif