mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-10-07 02:26:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	backends/imgui_impl_opengl3.cpp
This commit is contained in:
ocornut
2021-04-15 19:57:52 +02:00
parent 76902c482f 690a90bd35
commit 34d4bc620d
20 changed files with 277 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
backends/imgui_impl_dx11.cpp
View File

@@ -204,7 +204,7 @@ void ImGui_ImplDX11_RenderDrawData(ImDrawData* draw_data)
DXGI_FORMAT IndexBufferFormat;
ID3D11InputLayout* InputLayout;
};
BACKUP_DX11_STATE old;
BACKUP_DX11_STATE old = {};
old.ScissorRectsCount = old.ViewportsCount = D3D11_VIEWPORT_AND_SCISSORRECT_OBJECT_COUNT_PER_PIPELINE;
ctx->RSGetScissorRects(&old.ScissorRectsCount, old.ScissorRects);
ctx->RSGetViewports(&old.ViewportsCount, old.Viewports);