diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2019-12-29 05:19:25 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2019-12-29 05:19:25 +0000 |
| commit | e15c8b90c596bec23fbd95090300ca74e38bbc16 (patch) | |
| tree | 03c6a00073a666a1cba7f694e5b7b0eb7dc9caf4 | |
| parent | Updated samples module (fixed fullscreen mode selection combo) (diff) | |
| download | DiligentEngine-e15c8b90c596bec23fbd95090300ca74e38bbc16.tar.gz DiligentEngine-e15c8b90c596bec23fbd95090300ca74e38bbc16.zip | |
Updated submodules - fixed linux build problems
| -rw-r--r-- | .vscode/launch.json | 51 | ||||
| -rw-r--r-- | .vscode/settings.json | 6 | ||||
| m--------- | DiligentCore | 0 | ||||
| m--------- | DiligentFX | 0 | ||||
| m--------- | DiligentSamples | 0 | ||||
| m--------- | DiligentTools | 0 | ||||
| -rw-r--r-- | unityplugin/UnityEmulator/src/UnityGraphicsGLCore_Impl.h | 3 |
7 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/DiligentCore b/DiligentCore -Subproject 248312e3e6649521e403da70a75a53344b22244 +Subproject 3b82b187057c109fff3dea623045bd7196e8460 diff --git a/DiligentFX b/DiligentFX -Subproject 415b5f4468db84f06ea05e8ad91c29655d5db10 +Subproject ae6b9d2759992d88abbe951f23d9f86d54f803a diff --git a/DiligentSamples b/DiligentSamples -Subproject a56f45525ff8703985cf8553b66530e0515f11f +Subproject 4244efca9f65c9752b7782e1a5c8c2bf63c75bc diff --git a/DiligentTools b/DiligentTools -Subproject 707e9c63ce9af2801ff38ce0476570ca9204826 +Subproject cba8039c09d5934a5732ebfc8bc9a7765b1c35b 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 |