otomatalabs/furnace
8
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/tildearrow/furnace into k053260

Browse source
This commit is contained in:
cam900 2023-07-09 13:11:53 +09:00
commit 2a4e7267aa
21 changed files with 126 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

16
extern/igfd/dirent/dirent.h vendored
View file

@ -524,7 +524,15 @@ _wreaddir_r(
entry->d_off = 0;
entry->d_reclen = sizeof (struct _wdirent);
#ifdef _WIN64
entry->dwin_size = ((size_t)datap->nFileSizeHigh<<32) | datap->nFileSizeLow;
#else
if (datap->nFileSizeHigh) {
entry->dwin_size = 0xffffffff;
} else {
entry->dwin_size = datap->nFileSizeLow;
}
#endif
entry->dwin_mtime = datap->ftLastWriteTime;
/* Set result address */
@ -817,7 +825,15 @@ readdir_r(
entry->d_off = 0;
entry->d_reclen = sizeof (struct dirent);
#ifdef _WIN64
entry->dwin_size = ((size_t)datap->nFileSizeHigh<<32) | datap->nFileSizeLow;
#else
if (datap->nFileSizeHigh) {
entry->dwin_size = 0xffffffff;
} else {
entry->dwin_size = datap->nFileSizeLow;
}
#endif
entry->dwin_mtime = datap->ftLastWriteTime;
} else {

6
extern/imgui_patched/backends/imgui_impl_dx11.cpp vendored
View file

@ -361,9 +361,9 @@ static void ImGui_ImplDX11_CreateFontsTexture()
D3D11_SAMPLER_DESC desc;
ZeroMemory(&desc, sizeof(desc));
desc.Filter = D3D11_FILTER_MIN_MAG_MIP_LINEAR;
desc.AddressU = D3D11_TEXTURE_ADDRESS_WRAP;
desc.AddressV = D3D11_TEXTURE_ADDRESS_WRAP;
desc.AddressW = D3D11_TEXTURE_ADDRESS_WRAP;
desc.AddressU = D3D11_TEXTURE_ADDRESS_CLAMP;
desc.AddressV = D3D11_TEXTURE_ADDRESS_CLAMP;
desc.AddressW = D3D11_TEXTURE_ADDRESS_CLAMP;
desc.MipLODBias = 0.f;
desc.ComparisonFunc = D3D11_COMPARISON_ALWAYS;
desc.MinLOD = 0.f;