From e15c8b90c596bec23fbd95090300ca74e38bbc16 Mon Sep 17 00:00:00 2001 From: assiduous Date: Sat, 28 Dec 2019 21:19:25 -0800 Subject: Updated submodules - fixed linux build problems --- .vscode/launch.json | 51 +++++++++++++++++++--- .vscode/settings.json | 6 ++- DiligentCore | 2 +- DiligentFX | 2 +- DiligentSamples | 2 +- DiligentTools | 2 +- .../UnityEmulator/src/UnityGraphicsGLCore_Impl.h | 3 ++ 7 files changed, 55 insertions(+), 13 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 index 248312e..3b82b18 160000 --- a/DiligentCore +++ b/DiligentCore @@ -1 +1 @@ -Subproject commit 248312e3e6649521e403da70a75a53344b22244e +Subproject commit 3b82b187057c109fff3dea623045bd7196e84609 diff --git a/DiligentFX b/DiligentFX index 415b5f4..ae6b9d2 160000 --- a/DiligentFX +++ b/DiligentFX @@ -1 +1 @@ -Subproject commit 415b5f4468db84f06ea05e8ad91c29655d5db10d +Subproject commit ae6b9d2759992d88abbe951f23d9f86d54f803a0 diff --git a/DiligentSamples b/DiligentSamples index a56f455..4244efc 160000 --- a/DiligentSamples +++ b/DiligentSamples @@ -1 +1 @@ -Subproject commit a56f45525ff8703985cf8553b66530e0515f11fe +Subproject commit 4244efca9f65c9752b7782e1a5c8c2bf63c75bca diff --git a/DiligentTools b/DiligentTools index 707e9c6..cba8039 160000 --- a/DiligentTools +++ b/DiligentTools @@ -1 +1 @@ -Subproject commit 707e9c63ce9af2801ff38ce0476570ca92048268 +Subproject commit cba8039c09d5934a5732ebfc8bc9a7765b1c35b1 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 -- cgit v1.2.3