scratchfoundation/bgfx
1
0
Fork 0
mirror of https://github.com/scratchfoundation/bgfx.git synced 2025-02-17 20:31:57 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bkaradzic/bgfx

Browse source
This commit is contained in:
Branimir Karadžić 2014-12-02 20:33:23 -08:00
commit cafe34ee2f
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/common/imgui/imgui.cpp
View file

@ -58,7 +58,6 @@ static const int32_t DEFAULT_SPACING = 4;
static const int32_t TEXT_HEIGHT = 8; static const int32_t TEXT_HEIGHT = 8;
static const int32_t SCROLL_AREA_PADDING = 6; static const int32_t SCROLL_AREA_PADDING = 6;
static const int32_t AREA_HEADER = 20; static const int32_t AREA_HEADER = 20;
static const int32_t COLOR_WHEEL_PADDING = 60;
static const float s_tabStops[4] = {150, 210, 270, 330}; static const float s_tabStops[4] = {150, 210, 270, 330};
static void* imguiMalloc(size_t size, void* /*_userptr*/) static void* imguiMalloc(size_t size, void* /*_userptr*/)

15
src/bgfx.cpp
View file

@ -2245,6 +2245,7 @@ again:
_width = bx::uint32_max(1, _width); _width = bx::uint32_max(1, _width);
_height = bx::uint32_max(1, _height); _height = bx::uint32_max(1, _height);
_depth = bx::uint32_max(1, _depth); _depth = bx::uint32_max(1, _depth);
_numMips = bx::uint32_max(1, _numMips);
uint32_t width = _width; uint32_t width = _width;
uint32_t height = _height; uint32_t height = _height;
@ -2261,17 +2262,17 @@ again:
size += width*height*depth*bpp/8; size += width*height*depth*bpp/8;
width >>= 1; width >>= 1;
height >>= 1; height >>= 1;
depth >>= 1; depth >>= 1;
} }
_info.format = _format; _info.format = _format;
_info.storageSize = size; _info.width = _width;
_info.width = _width; _info.height = _height;
_info.height = _height; _info.depth = _depth;
_info.depth = _depth;
_info.numMips = _numMips; _info.numMips = _numMips;
_info.storageSize = size;
_info.bitsPerPixel = bpp; _info.bitsPerPixel = bpp;
} }