mirror of
https://github.com/ocornut/imgui.git
synced 2026-06-01 01:34:57 +08:00
Added ImFontAtlas section index in comments + minor tweaks to DX12 backends.
This commit is contained in:
@@ -19,7 +19,7 @@
|
|||||||
|
|
||||||
// CHANGELOG
|
// CHANGELOG
|
||||||
// (minor and older changes stripped away, please see git history for details)
|
// (minor and older changes stripped away, please see git history for details)
|
||||||
// 2024-12-09: DirectX12: Let user specifies the DepthStencilView format by setting ImGui_ImplDX12_InitInfo::DSVFormat.
|
// 2024-12-09: DirectX12: Let user specifies the DepthStencilView format by setting ImGui_ImplDX12_InitInfo::DSVFormat.
|
||||||
// 2024-11-15: DirectX12: *BREAKING CHANGE* Changed ImGui_ImplDX12_Init() signature to take a ImGui_ImplDX12_InitInfo struct. Legacy ImGui_ImplDX12_Init() signature is still supported (will obsolete).
|
// 2024-11-15: DirectX12: *BREAKING CHANGE* Changed ImGui_ImplDX12_Init() signature to take a ImGui_ImplDX12_InitInfo struct. Legacy ImGui_ImplDX12_Init() signature is still supported (will obsolete).
|
||||||
// 2024-11-15: DirectX12: *BREAKING CHANGE* User is now required to pass function pointers to allocate/free SRV Descriptors. We provide convenience legacy fields to pass a single descriptor, matching the old API, but upcoming features will want multiple.
|
// 2024-11-15: DirectX12: *BREAKING CHANGE* User is now required to pass function pointers to allocate/free SRV Descriptors. We provide convenience legacy fields to pass a single descriptor, matching the old API, but upcoming features will want multiple.
|
||||||
// 2024-10-23: DirectX12: Unmap() call specify written range. The range is informational and may be used by debug tools.
|
// 2024-10-23: DirectX12: Unmap() call specify written range. The range is informational and may be used by debug tools.
|
||||||
@@ -409,7 +409,7 @@ static void ImGui_ImplDX12_CreateFontsTexture()
|
|||||||
hr = bd->pd3dDevice->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&fence));
|
hr = bd->pd3dDevice->CreateFence(0, D3D12_FENCE_FLAG_NONE, IID_PPV_ARGS(&fence));
|
||||||
IM_ASSERT(SUCCEEDED(hr));
|
IM_ASSERT(SUCCEEDED(hr));
|
||||||
|
|
||||||
HANDLE event = CreateEvent(0, 0, 0, 0);
|
HANDLE event = ::CreateEvent(0, 0, 0, 0);
|
||||||
IM_ASSERT(event != nullptr);
|
IM_ASSERT(event != nullptr);
|
||||||
|
|
||||||
D3D12_COMMAND_QUEUE_DESC queueDesc = {};
|
D3D12_COMMAND_QUEUE_DESC queueDesc = {};
|
||||||
@@ -440,12 +440,12 @@ static void ImGui_ImplDX12_CreateFontsTexture()
|
|||||||
IM_ASSERT(SUCCEEDED(hr));
|
IM_ASSERT(SUCCEEDED(hr));
|
||||||
|
|
||||||
fence->SetEventOnCompletion(1, event);
|
fence->SetEventOnCompletion(1, event);
|
||||||
WaitForSingleObject(event, INFINITE);
|
::WaitForSingleObject(event, INFINITE);
|
||||||
|
|
||||||
cmdList->Release();
|
cmdList->Release();
|
||||||
cmdAlloc->Release();
|
cmdAlloc->Release();
|
||||||
cmdQueue->Release();
|
cmdQueue->Release();
|
||||||
CloseHandle(event);
|
::CloseHandle(event);
|
||||||
fence->Release();
|
fence->Release();
|
||||||
uploadBuffer->Release();
|
uploadBuffer->Release();
|
||||||
|
|
||||||
|
|||||||
@@ -2386,6 +2386,38 @@ ImFontConfig::ImFontConfig()
|
|||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
// [SECTION] ImFontAtlas
|
// [SECTION] ImFontAtlas
|
||||||
//-----------------------------------------------------------------------------
|
//-----------------------------------------------------------------------------
|
||||||
|
// - Default texture data encoded in ASCII
|
||||||
|
// - ImFontAtlas::ClearInputData()
|
||||||
|
// - ImFontAtlas::ClearTexData()
|
||||||
|
// - ImFontAtlas::ClearFonts()
|
||||||
|
// - ImFontAtlas::Clear()
|
||||||
|
// - ImFontAtlas::GetTexDataAsAlpha8()
|
||||||
|
// - ImFontAtlas::GetTexDataAsRGBA32()
|
||||||
|
// - ImFontAtlas::AddFont()
|
||||||
|
// - ImFontAtlas::AddFontDefault()
|
||||||
|
// - ImFontAtlas::AddFontFromFileTTF()
|
||||||
|
// - ImFontAtlas::AddFontFromMemoryTTF()
|
||||||
|
// - ImFontAtlas::AddFontFromMemoryCompressedTTF()
|
||||||
|
// - ImFontAtlas::AddFontFromMemoryCompressedBase85TTF()
|
||||||
|
// - ImFontAtlas::AddCustomRectRegular()
|
||||||
|
// - ImFontAtlas::AddCustomRectFontGlyph()
|
||||||
|
// - ImFontAtlas::CalcCustomRectUV()
|
||||||
|
// - ImFontAtlas::GetMouseCursorTexData()
|
||||||
|
// - ImFontAtlas::Build()
|
||||||
|
// - ImFontAtlasBuildMultiplyCalcLookupTable()
|
||||||
|
// - ImFontAtlasBuildMultiplyRectAlpha8()
|
||||||
|
// - ImFontAtlasBuildWithStbTruetype()
|
||||||
|
// - ImFontAtlasGetBuilderForStbTruetype()
|
||||||
|
// - ImFontAtlasUpdateConfigDataPointers()
|
||||||
|
// - ImFontAtlasBuildSetupFont()
|
||||||
|
// - ImFontAtlasBuildPackCustomRects()
|
||||||
|
// - ImFontAtlasBuildRender8bppRectFromString()
|
||||||
|
// - ImFontAtlasBuildRender32bppRectFromString()
|
||||||
|
// - ImFontAtlasBuildRenderDefaultTexData()
|
||||||
|
// - ImFontAtlasBuildRenderLinesTexData()
|
||||||
|
// - ImFontAtlasBuildInit()
|
||||||
|
// - ImFontAtlasBuildFinish()
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
// A work of art lies ahead! (. = white layer, X = black layer, others are blank)
|
// A work of art lies ahead! (. = white layer, X = black layer, others are blank)
|
||||||
// The 2x2 white texels on the top left are the ones we'll use everywhere in Dear ImGui to render filled shapes.
|
// The 2x2 white texels on the top left are the ones we'll use everywhere in Dear ImGui to render filled shapes.
|
||||||
@@ -3327,6 +3359,16 @@ void ImFontAtlasBuildFinish(ImFontAtlas* atlas)
|
|||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
// [SECTION] ImFontAtlas: glyph ranges helpers
|
// [SECTION] ImFontAtlas: glyph ranges helpers
|
||||||
//-------------------------------------------------------------------------
|
//-------------------------------------------------------------------------
|
||||||
|
// - GetGlyphRangesDefault()
|
||||||
|
// - GetGlyphRangesGreek()
|
||||||
|
// - GetGlyphRangesKorean()
|
||||||
|
// - GetGlyphRangesChineseFull()
|
||||||
|
// - GetGlyphRangesChineseSimplifiedCommon()
|
||||||
|
// - GetGlyphRangesJapanese()
|
||||||
|
// - GetGlyphRangesCyrillic()
|
||||||
|
// - GetGlyphRangesThai()
|
||||||
|
// - GetGlyphRangesVietnamese()
|
||||||
|
//-----------------------------------------------------------------------------
|
||||||
|
|
||||||
// Retrieve list of range (2 int per range, values are inclusive)
|
// Retrieve list of range (2 int per range, values are inclusive)
|
||||||
const ImWchar* ImFontAtlas::GetGlyphRangesDefault()
|
const ImWchar* ImFontAtlas::GetGlyphRangesDefault()
|
||||||
|
|||||||
Reference in New Issue
Block a user