Skip to content

Commit

Permalink
Merge branch 'main' into compressed-textures
Browse files Browse the repository at this point in the history
  • Loading branch information
@lilleyse
lilleyse authored Oct 3, 2023
2 parents e0f9107 + 088c916 commit f641485
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 187 deletions.
131 changes: 12 additions & 119 deletions .vscode/launch.linux.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,39 +14,13 @@
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"type": "cppdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"text": "set print elements 0"
}
]
},
{
"name": "Tests Extension",
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.cpp.tests.runner.kit"
],
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
"ASAN_OPTIONS": "detect_leaks=0",
"UBSAN_OPTIONS": "print_stacktrace=1"
"symbolLoadInfo": {
"loadAll": false,
"exceptionList": "libcesium.omniverse.plugin.so;libcesium.omniverse.cpp.tests.plugin.so"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing",
Expand All @@ -70,91 +44,8 @@
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"text": "set print elements 0"
}
]
},
{
"name": "Performance Tracing",
"preLaunchTask": "Build Only (release)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.dev.trace.kit"
],
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
"ASAN_OPTIONS": "detect_leaks=0",
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"type": "cppdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"text": "set print elements 0"
}
]
},
{
"name": "Performance Testing App",
"preLaunchTask": "Build Only (release)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
"args": [
"${workspaceFolder}/apps/cesium.performance.kit"
],
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
"ASAN_OPTIONS": "detect_leaks=0",
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"text": "set print elements 0"
}
]
},
{
"name": "C++ Unit Tests",
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/build-debug/bin/tests",
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
"ASAN_OPTIONS": "detect_leaks=0",
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"setupCommands": [
{
Expand All @@ -171,19 +62,21 @@
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.dev.kit"
"${workspaceFolder}/apps/cesium.omniverse.dev.python.debug.kit"
],
"env": {
// Disable LSAN when debugging since it doesn't work with GDB and prints harmless but annoying warning messages
"ASAN_OPTIONS": "detect_leaks=0",
"UBSAN_OPTIONS": "print_stacktrace=1"
},
"cwd": "${workspaceFolder}",
"type": "lldb",
"type": "cppdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"MIMode": "gdb",
"symbolLoadInfo": {
"loadAll": false,
"exceptionList": "libcesium.omniverse.plugin.so;libcesium.omniverse.cpp.tests.plugin.so"
},
"setupCommands": [
{
"text": "-enable-pretty-printing",
Expand All @@ -202,4 +95,4 @@
"host": "localhost"
}
]
}
}
72 changes: 4 additions & 68 deletions .vscode/launch.windows.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
"request": "launch"
},
{
"name": "Development App (Kit Debug)",
Expand All @@ -23,67 +21,7 @@
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Performance Tracing",
"preLaunchTask": "Build Only (release)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.dev.trace.kit"
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Performance Testing App",
"preLaunchTask": "Build Only (release)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
"args": [
"${workspaceFolder}/apps/cesium.performance.kit"
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "C++ Unit Tests",
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/build/bin/Debug/tests.exe",
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
},
{
"name": "Tests Extension",
"preLaunchTask": "Build Only (debug)",
"program": "${workspaceFolder}/extern/nvidia/_build/target-deps/kit-sdk/kit.exe",
"args": [
"${workspaceFolder}/apps/cesium.omniverse.cpp.tests.runner.kit"
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart",
"setupCommands": [
{
"text": "-enable-pretty-printing",
"ignoreFailures": true
},
{
"text": "set print elements 0"
}
]
"request": "launch"
},
{
"name": "Python Debugging (start)",
Expand All @@ -94,9 +32,7 @@
],
"cwd": "${workspaceFolder}",
"type": "cppvsdbg",
"request": "launch",
"console": "externalTerminal",
"internalConsoleOptions": "openOnSessionStart"
"request": "launch"
},
{
"name": "Python Debugging (attach)",
Expand All @@ -106,4 +42,4 @@
"host": "localhost"
}
]
}
}

0 comments on commit f641485

Please sign in to comment.