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

Luka-M · Dec 3, 2014 · cafe34e · cafe34e
2 parents a7290af + 54f0c36
commit cafe34e
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/examples/common/imgui/imgui.cpp b/examples/common/imgui/imgui.cpp
@@ -58,7 +58,6 @@ static const int32_t DEFAULT_SPACING = 4;
 static const int32_t TEXT_HEIGHT = 8;
 static const int32_t SCROLL_AREA_PADDING = 6;
 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 void* imguiMalloc(size_t size, void* /*_userptr*/)

diff --git a/src/bgfx.cpp b/src/bgfx.cpp
@@ -507,7 +507,7 @@ namespace bgfx
 				.end();
 
 			ShaderHandle vsh = BGFX_INVALID_HANDLE;
-			
+
 			struct Mem
 			{
 				Mem(const void* _data, size_t _size)
@@ -2245,6 +2245,7 @@ namespace bgfx
 		_width   = bx::uint32_max(1, _width);
 		_height  = bx::uint32_max(1, _height);
 		_depth   = bx::uint32_max(1, _depth);
+		_numMips = bx::uint32_max(1, _numMips);
 
 		uint32_t width  = _width;
 		uint32_t height = _height;
@@ -2261,17 +2262,17 @@ namespace bgfx
 
 			size += width*height*depth*bpp/8;
 
-			width >>= 1;
+			width  >>= 1;
 			height >>= 1;
-			depth >>= 1;
+			depth  >>= 1;
 		}
 
-		_info.format = _format;
-		_info.storageSize = size;
-		_info.width = _width;
-		_info.height = _height;
-		_info.depth = _depth;
+		_info.format  = _format;
+		_info.width   = _width;
+		_info.height  = _height;
+		_info.depth   = _depth;
 		_info.numMips = _numMips;
+		_info.storageSize  = size;
 		_info.bitsPerPixel = bpp;
 	}