mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
247 lines
7.2 KiB
Diff
247 lines
7.2 KiB
Diff
# HG changeset patch
|
|
# Parent 8e2ee5b1a34208fd10f501fdee330878e20df599
|
|
|
|
diff --git a/gfx/angle/src/compiler/Diagnostics.cpp b/gfx/angle/src/compiler/Diagnostics.cpp
|
|
--- a/gfx/angle/src/compiler/Diagnostics.cpp
|
|
+++ b/gfx/angle/src/compiler/Diagnostics.cpp
|
|
@@ -1,17 +1,17 @@
|
|
//
|
|
// Copyright (c) 2012 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
#include "compiler/Diagnostics.h"
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/InfoSink.h"
|
|
#include "compiler/preprocessor/new/SourceLocation.h"
|
|
|
|
TDiagnostics::TDiagnostics(TInfoSink& infoSink) :
|
|
mInfoSink(infoSink),
|
|
mNumErrors(0),
|
|
mNumWarnings(0)
|
|
{
|
|
diff --git a/gfx/angle/src/compiler/DirectiveHandler.cpp b/gfx/angle/src/compiler/DirectiveHandler.cpp
|
|
--- a/gfx/angle/src/compiler/DirectiveHandler.cpp
|
|
+++ b/gfx/angle/src/compiler/DirectiveHandler.cpp
|
|
@@ -3,17 +3,17 @@
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
#include "compiler/DirectiveHandler.h"
|
|
|
|
#include <sstream>
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/Diagnostics.h"
|
|
|
|
static TBehavior getBehavior(const std::string& str)
|
|
{
|
|
static const std::string kRequire("require");
|
|
static const std::string kEnable("enable");
|
|
static const std::string kDisable("disable");
|
|
static const std::string kWarn("warn");
|
|
diff --git a/gfx/angle/src/compiler/OutputGLSLBase.cpp b/gfx/angle/src/compiler/OutputGLSLBase.cpp
|
|
--- a/gfx/angle/src/compiler/OutputGLSLBase.cpp
|
|
+++ b/gfx/angle/src/compiler/OutputGLSLBase.cpp
|
|
@@ -1,16 +1,16 @@
|
|
//
|
|
// Copyright (c) 2002-2011 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
#include "compiler/OutputGLSLBase.h"
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
|
|
namespace
|
|
{
|
|
TString getTypeName(const TType& type)
|
|
{
|
|
TInfoSinkBase out;
|
|
if (type.isMatrix())
|
|
{
|
|
diff --git a/gfx/angle/src/compiler/OutputHLSL.cpp b/gfx/angle/src/compiler/OutputHLSL.cpp
|
|
--- a/gfx/angle/src/compiler/OutputHLSL.cpp
|
|
+++ b/gfx/angle/src/compiler/OutputHLSL.cpp
|
|
@@ -2,17 +2,17 @@
|
|
// Copyright (c) 2002-2012 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
#include "compiler/OutputHLSL.h"
|
|
|
|
#include "common/angleutils.h"
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/InfoSink.h"
|
|
#include "compiler/UnfoldShortCircuit.h"
|
|
#include "compiler/SearchSymbol.h"
|
|
#include "compiler/DetectDiscontinuity.h"
|
|
|
|
#include <stdio.h>
|
|
#include <algorithm>
|
|
|
|
diff --git a/gfx/angle/src/compiler/Types.h b/gfx/angle/src/compiler/Types.h
|
|
--- a/gfx/angle/src/compiler/Types.h
|
|
+++ b/gfx/angle/src/compiler/Types.h
|
|
@@ -4,17 +4,17 @@
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
#ifndef _TYPES_INCLUDED
|
|
#define _TYPES_INCLUDED
|
|
|
|
#include "compiler/BaseTypes.h"
|
|
#include "compiler/Common.h"
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
|
|
//
|
|
// Need to have association of line numbers to types in a list for building structs.
|
|
//
|
|
class TType;
|
|
struct TTypeLine {
|
|
TType* type;
|
|
int line;
|
|
diff --git a/gfx/angle/src/compiler/debug.cpp b/gfx/angle/src/compiler/compilerdebug.cpp
|
|
rename from gfx/angle/src/compiler/debug.cpp
|
|
rename to gfx/angle/src/compiler/compilerdebug.cpp
|
|
--- a/gfx/angle/src/compiler/debug.cpp
|
|
+++ b/gfx/angle/src/compiler/compilerdebug.cpp
|
|
@@ -1,17 +1,17 @@
|
|
//
|
|
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
// debug.cpp: Debugging utilities.
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#include "compiler/InitializeParseContext.h"
|
|
#include "compiler/ParseHelper.h"
|
|
|
|
static const int kTraceBufferLen = 1024;
|
|
diff --git a/gfx/angle/src/compiler/debug.h b/gfx/angle/src/compiler/compilerdebug.h
|
|
rename from gfx/angle/src/compiler/debug.h
|
|
rename to gfx/angle/src/compiler/compilerdebug.h
|
|
--- a/gfx/angle/src/compiler/debug.h
|
|
+++ b/gfx/angle/src/compiler/compilerdebug.h
|
|
@@ -1,15 +1,15 @@
|
|
//
|
|
// Copyright (c) 2002-2010 The ANGLE Project Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style license that can be
|
|
// found in the LICENSE file.
|
|
//
|
|
|
|
-// debug.h: Debugging utilities.
|
|
+// compilerdebug.h: Debugging utilities.
|
|
|
|
#ifndef COMPILER_DEBUG_H_
|
|
#define COMPILER_DEBUG_H_
|
|
|
|
#include <assert.h>
|
|
|
|
#ifdef _DEBUG
|
|
#define TRACE_ENABLED // define to enable debug message tracing
|
|
diff --git a/gfx/angle/src/compiler/osinclude.h b/gfx/angle/src/compiler/osinclude.h
|
|
--- a/gfx/angle/src/compiler/osinclude.h
|
|
+++ b/gfx/angle/src/compiler/osinclude.h
|
|
@@ -32,17 +32,17 @@
|
|
#include <windows.h>
|
|
#elif defined(ANGLE_OS_POSIX)
|
|
#include <pthread.h>
|
|
#include <semaphore.h>
|
|
#include <errno.h>
|
|
#endif // ANGLE_USE_NSPR
|
|
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
|
|
//
|
|
// Thread Local Storage Operations
|
|
//
|
|
#if defined(ANGLE_USE_NSPR)
|
|
typedef PRUintn OS_TLSIndex;
|
|
#define OS_INVALID_TLS_INDEX 0xFFFFFFFF
|
|
#elif defined(ANGLE_OS_WIN)
|
|
diff --git a/gfx/angle/src/compiler/preprocessor/atom.c b/gfx/angle/src/compiler/preprocessor/atom.c
|
|
--- a/gfx/angle/src/compiler/preprocessor/atom.c
|
|
+++ b/gfx/angle/src/compiler/preprocessor/atom.c
|
|
@@ -46,17 +46,17 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILI
|
|
// atom.c
|
|
//
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
|
|
#include "common/angleutils.h"
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/preprocessor/slglobals.h"
|
|
|
|
#undef malloc
|
|
#undef realloc
|
|
#undef free
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
////////////////////////////////////////// String table: //////////////////////////////////////
|
|
diff --git a/gfx/angle/src/compiler/preprocessor/tokens.c b/gfx/angle/src/compiler/preprocessor/tokens.c
|
|
--- a/gfx/angle/src/compiler/preprocessor/tokens.c
|
|
+++ b/gfx/angle/src/compiler/preprocessor/tokens.c
|
|
@@ -46,17 +46,17 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILI
|
|
//
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
|
|
#include "common/angleutils.h"
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/preprocessor/slglobals.h"
|
|
#include "compiler/util.h"
|
|
|
|
#if defined(_MSC_VER)
|
|
#pragma warning(disable: 4054)
|
|
#pragma warning(disable: 4152)
|
|
#endif
|
|
|
|
diff --git a/gfx/angle/src/compiler/translator_common.vcproj b/gfx/angle/src/compiler/translator_common.vcproj
|
|
--- a/gfx/angle/src/compiler/translator_common.vcproj
|
|
+++ b/gfx/angle/src/compiler/translator_common.vcproj
|
|
@@ -580,17 +580,17 @@
|
|
RelativePath=".\Common.h"
|
|
>
|
|
</File>
|
|
<File
|
|
RelativePath=".\ConstantUnion.h"
|
|
>
|
|
</File>
|
|
<File
|
|
- RelativePath=".\debug.h"
|
|
+ RelativePath=".\compilerdebug.h"
|
|
>
|
|
</File>
|
|
<File
|
|
RelativePath=".\DetectRecursion.h"
|
|
>
|
|
</File>
|
|
<File
|
|
RelativePath=".\Diagnostics.h"
|