| author | Jingning Ji <jingning.ji@oracle.com> |
| Fri, 16 Sep 2016 16:06:45 -0700 | |
| changeset 6919 | 7972aae0fb03 |
| parent 5527 | 611b2d6efdfe |
| permissions | -rw-r--r-- |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
1 |
In house patch, will not send upstream. |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
2 |
ERR() function is already defined elsewhere. |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
3 |
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
4 |
--- mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:49:18.755193254 -0700 |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
5 |
+++ mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:48:39.108802848 -0700 |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
6 |
@@ -57,9 +57,9 @@ namespace gl |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
7 |
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
8 |
// A macro to output a function call and its arguments to the debugging log, in case of error. |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
9 |
#if defined(ANGLE_TRACE_ENABLED) |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
10 |
-#define ERR(message, ...) gl::trace(false, gl::MESSAGE_ERR, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
|
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
11 |
+#define FFERR(message, ...) gl::trace(false, gl::MESSAGE_ERR, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
12 |
#else |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
13 |
-#define ERR(message, ...) (void(0)) |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
14 |
+#define FFERR(message, ...) (void(0)) |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
15 |
#endif |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
16 |
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
17 |
// A macro to log a performance event around a scope. |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
18 |
@@ -105,7 +105,7 @@ namespace gl |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
19 |
#if !defined(NDEBUG) |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
20 |
#define ASSERT(expression) { \
|
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
21 |
if(!(expression)) \ |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
22 |
- ERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
23 |
+ FFERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
24 |
assert(expression); \ |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
25 |
} ANGLE_EMPTY_STATEMENT |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
26 |
#define UNUSED_ASSERTION_VARIABLE(variable) |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
27 |
@@ -144,11 +144,11 @@ namespace gl |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
28 |
// A macro for code which is not expected to be reached under valid assumptions |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
29 |
#if !defined(NDEBUG) |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
30 |
#define UNREACHABLE() { \
|
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
31 |
- ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
32 |
+ FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
33 |
assert(false); \ |
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
34 |
} ANGLE_EMPTY_STATEMENT |
|
5527
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
35 |
#else |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
36 |
- #define UNREACHABLE() ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__)
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
37 |
+ #define UNREACHABLE() FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__)
|
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
38 |
#endif |
|
611b2d6efdfe
21602607 Need to move Firefox to 38.5.0 ESR branch to continue getting fixes
Stacy Yeh <stacy.yeh@oracle.com>
parents:
diff
changeset
|
39 |
|
|
6919
7972aae0fb03
24508672 Upgrade Firefox to version 45.1.1 ESR
Jingning Ji <jingning.ji@oracle.com>
parents:
5527
diff
changeset
|
40 |
#endif // COMMON_DEBUG_H_ |