mirrors/bgfx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup.

Browse Source
This commit is contained in:
Branimir Karadžić 2018-03-01 17:30:28 -08:00
parent 15485134f7
commit b4229e4a17
2 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/common/nanovg/fontstash.h
View File

@ -903,7 +903,7 @@ int fonsAddFont(FONScontext* stash, const char* name, const char* path)
fp = 0; fp = 0;
if (readed != dataSize) goto error; if (readed != dataSize) goto error;
return fonsAddFontMem(stash, name, data, dataSize, 1); return fonsAddFontMem(stash, name, data, int(dataSize), 1);
error: error:
if (data) free(data); if (data) free(data);

6
src/renderer_d3d12.cpp
View File

@ -4626,7 +4626,6 @@ data.NumQualityLevels = 0;
{ {
const uint32_t pitch = bx::strideAlign(mip.m_width*mip.m_bpp / 8, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT); const uint32_t pitch = bx::strideAlign(mip.m_width*mip.m_bpp / 8, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
const uint32_t slice = bx::strideAlign(mip.m_height*pitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT); const uint32_t slice = bx::strideAlign(mip.m_height*pitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
const uint32_t size = slice*depth;
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, slice*depth); uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, slice*depth);
bimg::imageCopy(temp bimg::imageCopy(temp
@ -4644,11 +4643,6 @@ data.NumQualityLevels = 0;
++kk; ++kk;
} }
else
{
const uint32_t pitch = bx::strideAlign(width*bpp / 8, D3D12_TEXTURE_DATA_PITCH_ALIGNMENT);
const uint32_t slice = bx::strideAlign(height*pitch, D3D12_TEXTURE_DATA_PLACEMENT_ALIGNMENT);
}
width >>= 1; width >>= 1;
height >>= 1; height >>= 1;