4 --- mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:49:18.755193254 -0700 |
4 --- mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:49:18.755193254 -0700 |
5 +++ mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:48:39.108802848 -0700 |
5 +++ mozilla-esr38/gfx/angle/src/common/debug.h 2015-10-26 15:48:39.108802848 -0700 |
6 @@ -57,9 +57,9 @@ namespace gl |
6 @@ -57,9 +57,9 @@ namespace gl |
7 |
7 |
8 // A macro to output a function call and its arguments to the debugging log, in case of error. |
8 // A macro to output a function call and its arguments to the debugging log, in case of error. |
9 #if defined(ANGLE_ENABLE_DEBUG_TRACE) || defined(ANGLE_ENABLE_DEBUG_ANNOTATIONS) |
9 #if defined(ANGLE_TRACE_ENABLED) |
10 -#define ERR(message, ...) gl::trace(false, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
10 -#define ERR(message, ...) gl::trace(false, gl::MESSAGE_ERR, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
11 +#define FFERR(message, ...) gl::trace(false, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
11 +#define FFERR(message, ...) gl::trace(false, gl::MESSAGE_ERR, "err: %s(%d): " message "\n", __FUNCTION__, __LINE__, ##__VA_ARGS__) |
12 #else |
12 #else |
13 -#define ERR(message, ...) (void(0)) |
13 -#define ERR(message, ...) (void(0)) |
14 +#define FFERR(message, ...) (void(0)) |
14 +#define FFERR(message, ...) (void(0)) |
15 #endif |
15 #endif |
16 |
16 |
17 // A macro to log a performance event around a scope. |
17 // A macro to log a performance event around a scope. |
18 @@ -77,7 +77,7 @@ namespace gl |
18 @@ -105,7 +105,7 @@ namespace gl |
19 #if !defined(NDEBUG) |
19 #if !defined(NDEBUG) |
20 #define ASSERT(expression) do { \ |
20 #define ASSERT(expression) { \ |
21 if(!(expression)) \ |
21 if(!(expression)) \ |
22 - ERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \ |
22 - ERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \ |
23 + FFERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \ |
23 + FFERR("\t! Assert failed in %s(%d): "#expression"\n", __FUNCTION__, __LINE__); \ |
24 assert(expression); \ |
24 assert(expression); \ |
25 } while(0) |
25 } ANGLE_EMPTY_STATEMENT |
26 #define UNUSED_ASSERTION_VARIABLE(variable) |
26 #define UNUSED_ASSERTION_VARIABLE(variable) |
27 @@ -116,11 +116,11 @@ namespace gl |
27 @@ -144,11 +144,11 @@ namespace gl |
28 // A macro for code which is not expected to be reached under valid assumptions |
28 // A macro for code which is not expected to be reached under valid assumptions |
29 #if !defined(NDEBUG) |
29 #if !defined(NDEBUG) |
30 #define UNREACHABLE() do { \ |
30 #define UNREACHABLE() { \ |
31 - ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \ |
31 - ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \ |
32 + FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \ |
32 + FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__); \ |
33 assert(false); \ |
33 assert(false); \ |
34 } while(0) |
34 } ANGLE_EMPTY_STATEMENT |
35 #else |
35 #else |
36 - #define UNREACHABLE() ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__) |
36 - #define UNREACHABLE() ERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__) |
37 + #define UNREACHABLE() FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__) |
37 + #define UNREACHABLE() FFERR("\t! Unreachable reached: %s(%d)\n", __FUNCTION__, __LINE__) |
38 #endif |
38 #endif |
39 |
39 |
40 // A macro that determines whether an object has a given runtime type. |
40 #endif // COMMON_DEBUG_H_ |
41 --- mozilla-esr38/gfx/angle/src/common/winrt/IInspectableNativeWindow.cpp 2015-10-26 15:51:25.857595462 -0700 |
|
42 +++ mozilla-esr38/gfx/angle/src/common/winrt/IInspectableNativeWindow.cpp 2015-10-26 15:50:59.541429136 -0700 |
|
43 @@ -44,7 +44,7 @@ bool NativeWindow::initialize() |
|
44 } |
|
45 else |
|
46 { |
|
47 - ERR("Invalid IInspectable EGLNativeWindowType detected. Valid IInspectables include ICoreWindow and IPropertySet"); |
|
48 + FFERR("Invalid IInspectable EGLNativeWindowType detected. Valid IInspectables include ICoreWindow and IPropertySet"); |
|
49 } |
|
50 |
|
51 return false; |
|
52 @@ -127,7 +127,7 @@ bool isEGLConfiguredPropertySet(EGLNativ |
|
53 // considered invalid. |
|
54 if (SUCCEEDED(result) && !hasEglNativeWindowPropertyKey) |
|
55 { |
|
56 - ERR("Could not find EGLNativeWindowTypeProperty in IPropertySet. Valid EGLNativeWindowTypeProperty values include ICoreWindow"); |
|
57 + FFERR("Could not find EGLNativeWindowTypeProperty in IPropertySet. Valid EGLNativeWindowTypeProperty values include ICoreWindow"); |
|
58 return false; |
|
59 } |
|
60 |
|