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, 192 deletions

diff --git a/mesalib/src/mesa/drivers/windows/gldirect/ddlog.c b/mesalib/src/mesa/drivers/windows/gldirect/ddlog.c
deleted file mode 100644
index 4ae79e2fd..000000000
--- a/mesalib/src/mesa/drivers/windows/gldirect/ddlog.c
+++ /dev/null
@@ -1,192 +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:  Logging functions.
-*
-****************************************************************************/
-
-#define STRICT
-#include <windows.h>
-
-#include "ddlog.h"
-#include "gld_driver.h"
-
-// ***********************************************************************
-
-static char						ddlogbuf[256];
-static FILE*					fpDDLog = NULL; // Log file pointer
-static char						szDDLogName[_MAX_PATH] = {"gldirect.log"}; 	// Filename of the log
-static DDLOG_loggingMethodType	ddlogLoggingMethod = DDLOG_NONE; 	// Default to No Logging
-static DDLOG_severityType		ddlogDebugLevel;
-static BOOL						bUIWarning = FALSE;	// MessageBox warning ?
-
-// ***********************************************************************
-
-void ddlogOpen(
-	DDLOG_loggingMethodType LoggingMethod,
-	DDLOG_severityType Severity)
-{
-	if (fpDDLog != NULL) {
-		// Tried to re-open the log
-		ddlogMessage(DDLOG_WARN, "Tried to re-open the log file\n");
-		return;
-	}
-
-	ddlogLoggingMethod = LoggingMethod;
-	ddlogDebugLevel = Severity;
-
-	if (ddlogLoggingMethod == DDLOG_NORMAL) {
-		fpDDLog = fopen(szDDLogName, "wt");
-        if (fpDDLog == NULL)
-            return;
-    }
-
-	ddlogMessage(DDLOG_SYSTEM, "\n");
-	ddlogMessage(DDLOG_SYSTEM, "-> Logging Started\n");
-}
-
-// ***********************************************************************
-
-void ddlogClose()
-{
-	// Determine whether the log is already closed
-	if (fpDDLog == NULL && ddlogLoggingMethod == DDLOG_NORMAL)
-		return; // Nothing to do.
-
-	ddlogMessage(DDLOG_SYSTEM, "<- Logging Ended\n");
-
-	if (ddlogLoggingMethod == DDLOG_NORMAL) {
-		fclose(fpDDLog);
-		fpDDLog = NULL;
-	}
-}
-
-// ***********************************************************************
-
-void ddlogMessage(
-	DDLOG_severityType severity,
-	LPSTR message)
-{
-	char buf[256];
-
-	// Bail if logging is disabled
-	if (ddlogLoggingMethod == DDLOG_NONE)
-		return;
-
-	if (ddlogLoggingMethod == DDLOG_CRASHPROOF)
-		fpDDLog = fopen(szDDLogName, "at");
-
-	if (fpDDLog == NULL)
-		return;
-
-	if (severity >= ddlogDebugLevel) {
-		sprintf(buf, "DDLog: (%s) %s", ddlogSeverityMessages[severity], message);
-		fputs(buf, fpDDLog); // Write string to file
-		OutputDebugString(buf); // Echo to debugger
-	}
-
-	if (ddlogLoggingMethod == DDLOG_CRASHPROOF) {
-		fflush(fpDDLog); // Write info to disk
-		fclose(fpDDLog);
-		fpDDLog = NULL;
-	}
-
-	// Popup message box if critical error
-	if (bUIWarning && severity == DDLOG_CRITICAL) {
-		MessageBox(NULL, buf, "GLDirect", MB_OK | MB_ICONWARNING | MB_TASKMODAL);
-	}
-}
-
-// ***********************************************************************
-
-// Write a string value to the log file
-void ddlogError(
-	DDLOG_severityType severity,
-	LPSTR message,
-	HRESULT hResult)
-{
-#ifdef _USE_GLD3_WGL
-	char dxErrStr[1024];
-	_gldDriver.GetDXErrorString(hResult, &dxErrStr[0], sizeof(dxErrStr));
-	if (FAILED(hResult)) {
-		sprintf(ddlogbuf, "DDLog: %s %8x:[ %s ]\n", message, hResult, dxErrStr);
-	} else
-		sprintf(ddlogbuf, "DDLog: %s\n", message);
-#else
-	if (FAILED(hResult)) {
-		sprintf(ddlogbuf, "DDLog: %s %8x:[ %s ]\n", message, hResult, DDErrorToString(hResult));
-	} else
-		sprintf(ddlogbuf, "DDLog: %s\n", message);
-#endif
-	ddlogMessage(severity, ddlogbuf);
-}
-
-// ***********************************************************************
-
-void ddlogPrintf(
-	DDLOG_severityType severity,
-	LPSTR message,
-	...)
-{
-	va_list args;
-
-	va_start(args, message);
-	vsprintf(ddlogbuf, message, args);
-	va_end(args);
-
-	lstrcat(ddlogbuf, "\n");
-
-	ddlogMessage(severity, ddlogbuf);
-}
-
-// ***********************************************************************
-
-void ddlogWarnOption(
-	BOOL bWarnOption)
-{
-	bUIWarning = bWarnOption;
-}
-
-// ***********************************************************************
-
-void ddlogPathOption(
-	LPSTR szPath)
-{
-	char szPathName[_MAX_PATH];
-
-	strcpy(szPathName, szPath);
-    strcat(szPathName, "\\");
-    strcat(szPathName, szDDLogName);
-    strcpy(szDDLogName, szPathName);
-}
-
-// ***********************************************************************