diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-29 07:37:10 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-29 07:37:10 +0000 |
| commit | 095bc74fecc2ce6242d99dadc91a66f874aa9cbb (patch) | |
| tree | 0d6192fd4de762e2325e73d2ec7bd865d56984af | |
| parent | travis: enabled tests (diff) | |
| parent | Updated submodules - fixed linux build problems (diff) | |
| download | DiligentEngine-095bc74fecc2ce6242d99dadc91a66f874aa9cbb.tar.gz DiligentEngine-095bc74fecc2ce6242d99dadc91a66f874aa9cbb.zip | |
Merge branch 'master' of https://github.com/DiligentGraphics/DiligentEngine
| -rw-r--r-- | .vscode/launch.json | 51 | ||||
| -rw-r--r-- | .vscode/settings.json | 6 | ||||
| -rw-r--r-- | unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h | 3 |
3 files changed, 51 insertions, 9 deletions
diff --git a/.vscode/launch.json b/.vscode/launch.json index 7b865be..542d9c2 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -5,10 +5,10 @@ "version": "0.2.0", "configurations": [ { - "name": "AtmosphereSample", + "name": "Atmosphere", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/DiligentSamples/Samples/Atmosphere/AtmosphereSample", + "program": "${workspaceFolder}/build/DiligentSamples/Samples/Atmosphere/Atmosphere", "args": ["-mode vk"], "stopAtEntry": false, "cwd": "${workspaceFolder}/DiligentSamples/Samples/Atmosphere/assets", @@ -43,10 +43,10 @@ ] }, { - "name": "ShadowsSample", + "name": "Shadows", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/DiligentSamples/Samples/Shadows/ShadowsSample", + "program": "${workspaceFolder}/build/DiligentSamples/Samples/Shadows/Shadows", "args": ["-mode vk"], "stopAtEntry": false, "cwd": "${workspaceFolder}/DiligentSamples/Samples/Shadows/assets", @@ -423,13 +423,50 @@ ] }, { - "name": "TestApp", + "name": "Tutorial17_MSAA", "type": "cppdbg", "request": "launch", - "program": "${workspaceFolder}/build/Tests/TestApp/TestApp", + "program": "${workspaceFolder}/build/DiligentSamples/Tutorials/Tutorial17_MSAA/Tutorial17_MSAA", "args": ["-mode vk"], "stopAtEntry": false, - "cwd": "${workspaceFolder}/Tests/TestApp/assets", + "cwd": "${workspaceFolder}/DiligentSamples/Tutorials/Tutorial17_MSAA/assets", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, + { + "name": "DiligentCoreTest", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/DiligentCore/Tests/DiligentCoreTest/DiligentCoreTest", + "stopAtEntry": false, + "cwd": "${workspaceFolder}/DiligentCore/Tests/DiligentCoreTest", + "environment": [], + "externalConsole": true, + "MIMode": "gdb", + "setupCommands": [ + { + "description": "Enable pretty-printing for gdb", + "text": "-enable-pretty-printing", + "ignoreFailures": true + } + ] + }, + { + "name": "DiligentCoreAPITest", + "type": "cppdbg", + "request": "launch", + "program": "${workspaceFolder}/build/DiligentCore/Tests/DiligentCoreAPITest/DiligentCoreAPITest", + "args": ["--mode=vk"], + "stopAtEntry": false, + "cwd": "${workspaceFolder}/DiligentCore/Tests/DiligentCoreAPITest/assets", "environment": [], "externalConsole": true, "MIMode": "gdb", diff --git a/.vscode/settings.json b/.vscode/settings.json index bbf7401..a0934d3 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,6 +1,6 @@ { "cmake.buildDirectory": "${workspaceRoot}/build", - "cmake.configureSettings": { "DILIGENT_ENABLE_TESTS": "TRUE"}, + "cmake.configureSettings": { "DILIGENT_BUILD_TESTS": "TRUE"}, "files.associations": { "*.tcc": "cpp", "ostream": "cpp", @@ -67,6 +67,8 @@ "memory_resource": "cpp", "random": "cpp", "set": "cpp", - "cfenv": "cpp" + "cfenv": "cpp", + "style.c": "cpp", + "overview.c": "cpp" } } diff --git a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h index 97c47b6..16fa4cf 100644 --- a/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h +++ b/unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h @@ -42,6 +42,9 @@ # ifdef Success # undef Success # endif +# ifdef None +# undef None +# endif #elif PLATFORM_MACOS |