Skip to content

MacOS App: Integrated WebGPUView#263

Open
MikhailGorobets wants to merge 2 commits intoDiligentGraphics:masterfrom
MikhailGorobets:dev
Open

MacOS App: Integrated WebGPUView#263
MikhailGorobets wants to merge 2 commits intoDiligentGraphics:masterfrom
MikhailGorobets:dev

Conversation

@MikhailGorobets
Copy link
Contributor

No description provided.

@@ -0,0 +1,87 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ImGui changes seem to be unrelated to WebGPU on Mac?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Didn’t want to create a separate PR(we can use rebase instead squash). On macOS, ImGui runs into an issue when using ImIO.Fonts->AddFontFromFileTTF, since internally it uses fopen.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be submitted separately - we need to merge this into development first and then try to build the main module to make sure all tests pass since it affects all platforms.

@@ -0,0 +1,87 @@
/*
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This needs to be submitted separately - we need to merge this into development first and then try to build the main module to make sure all tests pass since it affects all platforms.

Comment on lines +32 to +49
namespace Diligent
{

#if PLATFORM_WIN32
class WindowsFile;
using ImGuiFile = WindowsFile;
#elif PLATFORM_UNIVERSAL_WINDOWS
class WindowsStoreFile;
using ImGuiFile = WindowsStoreFile;
#elif PLATFORM_ANDROID
class AndroidFile;
using ImGuiFile = AndroidFile;
#else
class StandardFile;
using ImGuiFile = StandardFile;
#endif

} // namespace Diligent
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

* of the possibility of such damages.
*/

#include "ImGuiDiligentConfig.h"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think ImGuiDiligentConfig.h is helpful (unless it needs to be included somewhere else).
The function definitions can be added right in the source file here - it will be cleaner

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants