Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2025-07-07 13:35:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into docking

Browse Source 
# Conflicts:
#	backends/imgui_impl_dx12.cpp
#	backends/imgui_impl_dx9.cpp
#	imgui.cpp
#	imgui.h
This commit is contained in:
ocornut
2021-02-09 13:17:24 +01:00
parent 73ccb7e4b8 56f7bdae99
commit 7a516a266d
26 changed files with 546 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/example_emscripten_wgpu/main.cpp
View File

@ -75,7 +75,7 @@ int main(int, char**)
//ImGui::StyleColorsClassic();
// Setup Platform/Renderer backends
ImGui_ImplGlfw_InitForVulkan(window, true);
ImGui_ImplGlfw_InitForWebGPU(window, true);
ImGui_ImplWGPU_Init(wgpu_device, 3, WGPUTextureFormat_RGBA8Unorm);
// Load Fonts