mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-02-07 04:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into docking

Browse Source 
# Conflicts:
#	examples/imgui_impl_dx9.cpp
#	examples/imgui_impl_opengl3.cpp
This commit is contained in:
omar
2019-04-03 11:17:26 +02:00
parent 9bf6509c6e 8dab7ac021
commit 49fb8e6c45
17 changed files with 138 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/imgui_impl_dx11.cpp
View File

@@ -96,7 +96,7 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
return;
}
// Copy and convert all vertices into a single contiguous buffer
// Upload vertex/index data into a single contiguous GPU buffer
D3D11_MAPPED_SUBRESOURCE vtx_resource, idx_resource;
if (ctx->Map(g_pVB, 0, D3D11_MAP_WRITE_DISCARD, 0, &vtx_resource) != S_OK)
return;