Skip to content

Commit 7b0a1b5

Browse files
Updated submodules and UnityAppLinux (few linux fixes)
1 parent 2a3ad30 commit 7b0a1b5

File tree

4 files changed

+23
-3
lines changed

4 files changed

+23
-3
lines changed

.vscode/launch.json

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -498,6 +498,25 @@
498498
}
499499
]
500500
},
501+
{
502+
"name": "Tutorial20_MeshShader",
503+
"type": "cppdbg",
504+
"request": "launch",
505+
"program": "${workspaceFolder}/build/DiligentSamples/Tutorials/Tutorial20_MeshShader/Tutorial20_MeshShader",
506+
"args": ["-mode vk"],
507+
"stopAtEntry": false,
508+
"cwd": "${workspaceFolder}/DiligentSamples/Tutorials/Tutorial20_MeshShader/assets",
509+
"environment": [],
510+
"externalConsole": true,
511+
"MIMode": "gdb",
512+
"setupCommands": [
513+
{
514+
"description": "Enable pretty-printing for gdb",
515+
"text": "-enable-pretty-printing",
516+
"ignoreFailures": true
517+
}
518+
]
519+
},
501520
{
502521
"name": "DiligentCoreTest",
503522
"type": "cppdbg",

unityplugin/UnityEmulator/src/Linux/UnityAppLinux.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,11 @@ class UnityAppLinux : public UnityAppBase
3434
m_DeviceType = Diligent::RENDER_DEVICE_TYPE_GL;
3535
}
3636

37-
virtual void OnGLContextCreated(Display* display, Window window)override final
37+
virtual bool OnGLContextCreated(Display* display, Window window)override final
3838
{
3939
InitGraphics(display, reinterpret_cast<void*>(static_cast<size_t>(window)), 0/*Unused*/, 0/*Unused*/);
4040
InitScene();
41+
return true;
4142
}
4243
#if VULKAN_SUPPORTED
4344
virtual bool InitVulkan(xcb_connection_t* connection, uint32_t window)override final

0 commit comments

Comments
 (0)