mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-12-04 19:33:18 +00:00
b9c5df43a5
No review because this is just syncing us with upstream: http://code.google.com/p/angleproject/ This is also doing some cleanup, removing stale/empty files and updating patches. The main benefit from this update is that long-identifier-shortening has been fixed.
199 lines
5.8 KiB
Diff
199 lines
5.8 KiB
Diff
# HG changeset patch
|
|
# Parent 326590fb862cf7e277487f48c7a434bde3566ea0
|
|
diff --git a/gfx/angle/Makefile.in b/gfx/angle/Makefile.in
|
|
--- a/gfx/angle/Makefile.in
|
|
+++ b/gfx/angle/Makefile.in
|
|
@@ -75,17 +75,17 @@ CPPSRCS = \
|
|
parseConst.cpp \
|
|
ParseHelper.cpp \
|
|
PoolAlloc.cpp \
|
|
QualifierAlive.cpp \
|
|
RemoveTree.cpp \
|
|
ShaderLang.cpp \
|
|
SymbolTable.cpp \
|
|
VariableInfo.cpp \
|
|
- debug.cpp \
|
|
+ compilerdebug.cpp \
|
|
ossource_nspr.cpp \
|
|
util.cpp \
|
|
ValidateLimitations.cpp \
|
|
ForLoopUnroll.cpp \
|
|
MapLongVariableNames.cpp \
|
|
BuiltInFunctionEmulator.cpp \
|
|
$(NULL)
|
|
|
|
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
|
|
@@ -1,17 +1,17 @@
|
|
//
|
|
// 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/OutputHLSL.h"
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/InfoSink.h"
|
|
#include "compiler/UnfoldSelect.h"
|
|
#include "compiler/SearchSymbol.h"
|
|
|
|
#include <stdio.h>
|
|
#include <algorithm>
|
|
|
|
namespace sh
|
|
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/compilerdebug.cpp b/gfx/angle/src/compiler/compilerdebug.cpp
|
|
--- a/gfx/angle/src/compiler/compilerdebug.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.
|
|
+// compilerdebug.cpp: Debugging utilities.
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
|
|
#include <stdarg.h>
|
|
#include <stdio.h>
|
|
|
|
#include "compiler/ParseHelper.h"
|
|
|
|
static const int kTraceBufferLen = 1024;
|
|
|
|
diff --git a/gfx/angle/src/compiler/compilerdebug.h b/gfx/angle/src/compiler/compilerdebug.h
|
|
--- a/gfx/angle/src/compiler/compilerdebug.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
|
|
@@ -31,17 +31,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
|
|
@@ -45,17 +45,17 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILI
|
|
//
|
|
// atom.c
|
|
//
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.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
|
|
@@ -45,17 +45,17 @@ NVIDIA HAS BEEN ADVISED OF THE POSSIBILI
|
|
// tokens.c
|
|
//
|
|
|
|
#include <stdlib.h>
|
|
#include <stdio.h>
|
|
#include <string.h>
|
|
#include <ctype.h>
|
|
|
|
-#include "compiler/debug.h"
|
|
+#include "compiler/compilerdebug.h"
|
|
#include "compiler/preprocessor/slglobals.h"
|
|
#include "compiler/util.h"
|
|
|
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
//////////////////////// Preprocessor and Token Recorder and Playback: ////////////////////////
|
|
///////////////////////////////////////////////////////////////////////////////////////////////
|
|
|
|
/*
|