1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
|
diff -up src/nvcore/CMakeLists.txt.orig src/nvcore/CMakeLists.txt
--- a/src/nvcore/CMakeLists.txt.orig 2021-02-24 15:38:17.873472614 -0300
+++ b/src/nvcore/CMakeLists.txt 2021-02-24 15:38:20.228485954 -0300
@@ -3,7 +3,6 @@ PROJECT(nvcore)
SET(CORE_SRCS
nvcore.h
Array.h
- Debug.h Debug.cpp
DefsGnucDarwin.h
DefsGnucLinux.h
DefsGnucWin32.h
diff -up src/bc7/avpcl_mode4.cpp.orig src/bc7/avpcl_mode4.cpp
--- a/src/bc7/avpcl_mode4.cpp.orig 2021-02-24 15:51:20.362903501 -0300
+++ b/src/bc7/avpcl_mode4.cpp 2021-02-24 15:51:52.829087279 -0300
@@ -519,7 +519,7 @@ static float map_colors(const Vector4 co
}
palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
(rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
+ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
toterr += besterr;
// do A index
@@ -647,7 +647,7 @@ static void assign_indices(const Tile &t
}
palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
(rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
+ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
toterr[region] += besterr;
// do A index
diff -up src/bc7/avpcl_mode5.cpp.orig src/bc7/avpcl_mode5.cpp
--- a/src/bc7/avpcl_mode5.cpp.orig 2021-02-24 15:51:27.342943012 -0300
+++ b/src/bc7/avpcl_mode5.cpp 2021-02-24 15:51:46.341050553 -0300
@@ -520,7 +520,7 @@ static float map_colors(const Vector4 co
}
palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[bestindex]).x :
(rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[bestindex]).y :
- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : nvCheckMacro(0);
+ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[bestindex]).z : 0;
toterr += besterr;
// do A index
@@ -648,7 +648,7 @@ static void assign_indices(const Tile &t
}
palette_alpha = (rotatemode == ROTATEMODE_RGBA_AGBR) ? (palette_rgb[region][bestindex]).x :
(rotatemode == ROTATEMODE_RGBA_RABG) ? (palette_rgb[region][bestindex]).y :
- (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : nvCheckMacro(0);
+ (rotatemode == ROTATEMODE_RGBA_RGAB) ? (palette_rgb[region][bestindex]).z : 0;
toterr[region] += besterr;
// do A index
diff -up CMakeLists.txt.orig CMakeLists.txt
--- a/CMakeLists.txt.orig 2021-02-25 09:37:08.120845257 -0300
+++ b/CMakeLists.txt 2021-02-25 09:37:14.926885247 -0300
@@ -30,6 +30,9 @@ IF(BUILD_SQUISH_WITH_ALTIVEC)
ADD_DEFINITIONS(-maltivec)
ENDIF(BUILD_SQUISH_WITH_ALTIVEC)
+SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
+SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DNV_NO_ASSERT=1 -DNV_DEBUG_PRINT=0")
+
IF(NVTT_SHARED)
SET(NVCORE_SHARED TRUE)
SET(NVMATH_SHARED TRUE)
diff -up src/nvtt/tools/cmdline.h.orig src/nvtt/tools/cmdline.h
--- a/src/nvtt/tools/cmdline.h.orig 2021-02-25 11:03:12.258338108 -0300
+++ b/src/nvtt/tools/cmdline.h 2021-02-25 11:04:02.152643276 -0300
@@ -33,10 +33,14 @@
struct MyMessageHandler : public nv::MessageHandler {
MyMessageHandler() {
+#if !NV_NO_ASSERT
nv::debug::setMessageHandler( this );
+#endif
}
~MyMessageHandler() {
+#if !NV_NO_ASSERT
nv::debug::resetMessageHandler();
+#endif
}
virtual void log( const char * str, va_list arg ) {
@@ -50,20 +54,26 @@ struct MyMessageHandler : public nv::Mes
struct MyAssertHandler : public nv::AssertHandler {
MyAssertHandler() {
+#if !NV_NO_ASSERT
nv::debug::setAssertHandler( this );
nv::debug::enableSigHandler(/*interactive=*/true);
+#endif
}
~MyAssertHandler() {
+#if !NV_NO_ASSERT
nv::debug::resetAssertHandler();
+#endif
}
// Handler method, note that func might be NULL!
virtual int assertion( const char *exp, const char *file, int line, const char *func, const char *msg, va_list arg ) {
fprintf(stderr, "Assertion failed: %s\nIn %s:%d\n", exp, file, line);
+#if !NV_NO_ASSERT
nv::debug::dumpInfo();
if (nv::debug::isDebuggerPresent()) {
return NV_ABORT_DEBUG;
}
+#endif
exit(1);
}
};
|
