author | Joe Drew <joe@drew.ca> |
Tue, 29 Mar 2011 18:16:39 -0400 | |
changeset 67999 | 133a3c3ac1fe73ca4892644e7f13bbf71854a0f6 |
parent 67998 | 6276eb5b2d9c3ef2dc24388a751526ce20c35aa4 |
child 68000 | 6cb170a9daf34b0179a72d2613a715a3ddbe54c3 |
push id | 19467 |
push user | jdrew@mozilla.com |
push date | Tue, 12 Apr 2011 08:31:49 +0000 |
treeherder | mozilla-central@48d6abe0a436 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | bjacob |
bugs | 641630 |
milestone | 2.2a1pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/gfx/angle/Makefile.in +++ b/gfx/angle/Makefile.in @@ -72,17 +72,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 \ $(NULL) # flex/yacc generated files CPPSRCS += \ glslang_lex.cpp \
--- a/gfx/angle/src/build_angle.gyp +++ b/gfx/angle/src/build_angle.gyp @@ -16,18 +16,18 @@ '.', '../include', ], 'sources': [ 'compiler/BaseTypes.h', 'compiler/Common.h', 'compiler/Compiler.cpp', 'compiler/ConstantUnion.h', - 'compiler/debug.cpp', - 'compiler/debug.h', + 'compiler/compilerdebug.cpp', + 'compiler/compilerdebug.h', 'compiler/glslang.h', 'compiler/glslang_lex.cpp', 'compiler/glslang_tab.cpp', 'compiler/glslang_tab.h', 'compiler/InfoSink.cpp', 'compiler/InfoSink.h', 'compiler/Initialize.cpp', 'compiler/Initialize.h',
--- a/gfx/angle/src/compiler/OutputGLSL.cpp +++ b/gfx/angle/src/compiler/OutputGLSL.cpp @@ -1,16 +1,16 @@ // // 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. // #include "compiler/OutputGLSL.h" -#include "compiler/debug.h" +#include "compiler/compilerdebug.h" namespace { TString getTypeName(const TType& type) { TInfoSinkBase out; if (type.isMatrix()) {
--- a/gfx/angle/src/compiler/OutputHLSL.cpp +++ b/gfx/angle/src/compiler/OutputHLSL.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. // #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
--- 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;
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. +// 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;
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
--- 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)
--- 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: //////////////////////////////////////
--- 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: //////////////////////// /////////////////////////////////////////////////////////////////////////////////////////////// /*