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

include/bgfx.h

@@ -91,61 +91,61 @@
 #define BGFX_STATE_BLEND_FUNC(_src, _dst) ( uint64_t(_src)|( uint64_t(_dst)<<4) )
 
 ///
-#define BGFX_STENCIL_FUNC_REF_SHIFT     0
-#define BGFX_STENCIL_FUNC_REF_MASK      UINT32_C(0x000000ff)
-#define BGFX_STENCIL_FUNC_RMASK_SHIFT   8
-#define BGFX_STENCIL_FUNC_RMASK_MASK    UINT32_C(0x0000ff00)
-
-#define BGFX_STENCIL_TEST_LESS          UINT32_C(0x00010000)
-#define BGFX_STENCIL_TEST_LEQUAL        UINT32_C(0x00020000)
-#define BGFX_STENCIL_TEST_EQUAL         UINT32_C(0x00030000)
-#define BGFX_STENCIL_TEST_GEQUAL        UINT32_C(0x00040000)
-#define BGFX_STENCIL_TEST_GREATER       UINT32_C(0x00050000)
-#define BGFX_STENCIL_TEST_NOTEQUAL      UINT32_C(0x00060000)
-#define BGFX_STENCIL_TEST_NEVER         UINT32_C(0x00070000)
-#define BGFX_STENCIL_TEST_ALWAYS        UINT32_C(0x00080000)
-#define BGFX_STENCIL_TEST_SHIFT         16
-#define BGFX_STENCIL_TEST_MASK          UINT32_C(0x000f0000)
-
-#define BGFX_STENCIL_OP_FAIL_S_ZERO     UINT32_C(0x00000000)
-#define BGFX_STENCIL_OP_FAIL_S_KEEP     UINT32_C(0x00100000)
-#define BGFX_STENCIL_OP_FAIL_S_REPLACE  UINT32_C(0x00200000)
-#define BGFX_STENCIL_OP_FAIL_S_INCR     UINT32_C(0x00300000)
-#define BGFX_STENCIL_OP_FAIL_S_INCRSAT  UINT32_C(0x00400000)
-#define BGFX_STENCIL_OP_FAIL_S_DECR     UINT32_C(0x00500000)
-#define BGFX_STENCIL_OP_FAIL_S_DECRSAT  UINT32_C(0x00600000)
-#define BGFX_STENCIL_OP_FAIL_S_INVERT   UINT32_C(0x00700000)
-#define BGFX_STENCIL_OP_FAIL_S_SHIFT    20
-#define BGFX_STENCIL_OP_FAIL_S_MASK     UINT32_C(0x00f00000)
-
-#define BGFX_STENCIL_OP_FAIL_Z_ZERO     UINT32_C(0x00000000)
-#define BGFX_STENCIL_OP_FAIL_Z_KEEP     UINT32_C(0x01000000)
-#define BGFX_STENCIL_OP_FAIL_Z_REPLACE  UINT32_C(0x02000000)
-#define BGFX_STENCIL_OP_FAIL_Z_INCR     UINT32_C(0x03000000)
-#define BGFX_STENCIL_OP_FAIL_Z_INCRSAT  UINT32_C(0x04000000)
-#define BGFX_STENCIL_OP_FAIL_Z_DECR     UINT32_C(0x05000000)
-#define BGFX_STENCIL_OP_FAIL_Z_DECRSAT  UINT32_C(0x06000000)
-#define BGFX_STENCIL_OP_FAIL_Z_INVERT   UINT32_C(0x07000000)
-#define BGFX_STENCIL_OP_FAIL_Z_SHIFT    24
-#define BGFX_STENCIL_OP_FAIL_Z_MASK     UINT32_C(0x0f000000)
-
-#define BGFX_STENCIL_OP_PASS_Z_ZERO     UINT32_C(0x00000000)
-#define BGFX_STENCIL_OP_PASS_Z_KEEP     UINT32_C(0x10000000)
-#define BGFX_STENCIL_OP_PASS_Z_REPLACE  UINT32_C(0x20000000)
-#define BGFX_STENCIL_OP_PASS_Z_INCR     UINT32_C(0x30000000)
-#define BGFX_STENCIL_OP_PASS_Z_INCRSAT  UINT32_C(0x40000000)
-#define BGFX_STENCIL_OP_PASS_Z_DECR     UINT32_C(0x50000000)
-#define BGFX_STENCIL_OP_PASS_Z_DECRSAT  UINT32_C(0x60000000)
-#define BGFX_STENCIL_OP_PASS_Z_INVERT   UINT32_C(0x70000000)
-#define BGFX_STENCIL_OP_PASS_Z_SHIFT    28
-#define BGFX_STENCIL_OP_PASS_Z_MASK     UINT32_C(0xf0000000)
-
-#define BGFX_STENCIL_NONE               UINT32_C(0x00000000)
-#define BGFX_STENCIL_MASK               UINT32_C(0xffffffff)
-#define BGFX_STENCIL_DEFAULT            UINT32_C(0x00000000)
-
-#define BGFX_STENCIL_FUNC_REF(_ref) ( (uint32_t(_ref)<<BGFX_STENCIL_FUNC_REF_SHIFT)&BGFX_STENCIL_FUNC_REF_MASK)
-#define BGFX_STENCIL_FUNC_RMASK(_mask) ( (uint32_t(_mask)<<BGFX_STENCIL_FUNC_RMASK_SHIFT)&BGFX_STENCIL_FUNC_RMASK_MASK)
+#define BGFX_STENCIL_FUNC_REF_SHIFT     0
+#define BGFX_STENCIL_FUNC_REF_MASK      UINT32_C(0x000000ff)
+#define BGFX_STENCIL_FUNC_RMASK_SHIFT   8
+#define BGFX_STENCIL_FUNC_RMASK_MASK    UINT32_C(0x0000ff00)
+
+#define BGFX_STENCIL_TEST_LESS          UINT32_C(0x00010000)
+#define BGFX_STENCIL_TEST_LEQUAL        UINT32_C(0x00020000)
+#define BGFX_STENCIL_TEST_EQUAL         UINT32_C(0x00030000)
+#define BGFX_STENCIL_TEST_GEQUAL        UINT32_C(0x00040000)
+#define BGFX_STENCIL_TEST_GREATER       UINT32_C(0x00050000)
+#define BGFX_STENCIL_TEST_NOTEQUAL      UINT32_C(0x00060000)
+#define BGFX_STENCIL_TEST_NEVER         UINT32_C(0x00070000)
+#define BGFX_STENCIL_TEST_ALWAYS        UINT32_C(0x00080000)
+#define BGFX_STENCIL_TEST_SHIFT         16
+#define BGFX_STENCIL_TEST_MASK          UINT32_C(0x000f0000)
+
+#define BGFX_STENCIL_OP_FAIL_S_ZERO     UINT32_C(0x00000000)
+#define BGFX_STENCIL_OP_FAIL_S_KEEP     UINT32_C(0x00100000)
+#define BGFX_STENCIL_OP_FAIL_S_REPLACE  UINT32_C(0x00200000)
+#define BGFX_STENCIL_OP_FAIL_S_INCR     UINT32_C(0x00300000)
+#define BGFX_STENCIL_OP_FAIL_S_INCRSAT  UINT32_C(0x00400000)
+#define BGFX_STENCIL_OP_FAIL_S_DECR     UINT32_C(0x00500000)
+#define BGFX_STENCIL_OP_FAIL_S_DECRSAT  UINT32_C(0x00600000)
+#define BGFX_STENCIL_OP_FAIL_S_INVERT   UINT32_C(0x00700000)
+#define BGFX_STENCIL_OP_FAIL_S_SHIFT    20
+#define BGFX_STENCIL_OP_FAIL_S_MASK     UINT32_C(0x00f00000)
+
+#define BGFX_STENCIL_OP_FAIL_Z_ZERO     UINT32_C(0x00000000)
+#define BGFX_STENCIL_OP_FAIL_Z_KEEP     UINT32_C(0x01000000)
+#define BGFX_STENCIL_OP_FAIL_Z_REPLACE  UINT32_C(0x02000000)
+#define BGFX_STENCIL_OP_FAIL_Z_INCR     UINT32_C(0x03000000)
+#define BGFX_STENCIL_OP_FAIL_Z_INCRSAT  UINT32_C(0x04000000)
+#define BGFX_STENCIL_OP_FAIL_Z_DECR     UINT32_C(0x05000000)
+#define BGFX_STENCIL_OP_FAIL_Z_DECRSAT  UINT32_C(0x06000000)
+#define BGFX_STENCIL_OP_FAIL_Z_INVERT   UINT32_C(0x07000000)
+#define BGFX_STENCIL_OP_FAIL_Z_SHIFT    24
+#define BGFX_STENCIL_OP_FAIL_Z_MASK     UINT32_C(0x0f000000)
+
+#define BGFX_STENCIL_OP_PASS_Z_ZERO     UINT32_C(0x00000000)
+#define BGFX_STENCIL_OP_PASS_Z_KEEP     UINT32_C(0x10000000)
+#define BGFX_STENCIL_OP_PASS_Z_REPLACE  UINT32_C(0x20000000)
+#define BGFX_STENCIL_OP_PASS_Z_INCR     UINT32_C(0x30000000)
+#define BGFX_STENCIL_OP_PASS_Z_INCRSAT  UINT32_C(0x40000000)
+#define BGFX_STENCIL_OP_PASS_Z_DECR     UINT32_C(0x50000000)
+#define BGFX_STENCIL_OP_PASS_Z_DECRSAT  UINT32_C(0x60000000)
+#define BGFX_STENCIL_OP_PASS_Z_INVERT   UINT32_C(0x70000000)
+#define BGFX_STENCIL_OP_PASS_Z_SHIFT    28
+#define BGFX_STENCIL_OP_PASS_Z_MASK     UINT32_C(0xf0000000)
+
+#define BGFX_STENCIL_NONE               UINT32_C(0x00000000)
+#define BGFX_STENCIL_MASK               UINT32_C(0xffffffff)
+#define BGFX_STENCIL_DEFAULT            UINT32_C(0x00000000)
+
+#define BGFX_STENCIL_FUNC_REF(_ref) ( (uint32_t(_ref)<<BGFX_STENCIL_FUNC_REF_SHIFT)&BGFX_STENCIL_FUNC_REF_MASK)
+#define BGFX_STENCIL_FUNC_RMASK(_mask) ( (uint32_t(_mask)<<BGFX_STENCIL_FUNC_RMASK_SHIFT)&BGFX_STENCIL_FUNC_RMASK_MASK)
 
 ///
 #define BGFX_CLEAR_NONE                 UINT8_C(0x00)
@@ -390,8 +390,8 @@ namespace bgfx
 		virtual void captureFrame(const void* _data, uint32_t _size) = 0;
 	};
 
-	inline CallbackI::~CallbackI()
-	{
+	inline CallbackI::~CallbackI()
+	{
 	}
 
 	struct Memory
@@ -620,21 +620,21 @@ namespace bgfx
 	/// Calculate amount of memory required for texture.
 	void calcTextureSize(TextureInfo& _info, uint16_t _width, uint16_t _height, uint16_t _depth, uint8_t _numMips, TextureFormat::Enum _format);
 
-	/// Create texture from memory buffer.
-	/// @param _mem DDS texture data.
-	/// @param _flags Default texture sampling mode is linear, and wrap mode
-	///   is repeat.
-	///
-	///   BGFX_TEXTURE_[U/V/W]_[MIRROR/CLAMP] - Mirror or clamp to edge wrap
-	///     mode.
-	///
-	///   BGFX_TEXTURE_[MIN/MAG/MIP]_[POINT/ANISOTROPIC] - Point or anisotropic
-	///     sampling.
-	///
-	///   BGFX_TEXTURE_SRGB - Sample as sRGB texture.
-	///
-	/// @param _info Returns parsed DDS texture information.
-	/// @returns Texture handle.
+	/// Create texture from memory buffer.
+	/// @param _mem DDS texture data.
+	/// @param _flags Default texture sampling mode is linear, and wrap mode
+	///   is repeat.
+	///
+	///   BGFX_TEXTURE_[U/V/W]_[MIRROR/CLAMP] - Mirror or clamp to edge wrap
+	///     mode.
+	///
+	///   BGFX_TEXTURE_[MIN/MAG/MIP]_[POINT/ANISOTROPIC] - Point or anisotropic
+	///     sampling.
+	///
+	///   BGFX_TEXTURE_SRGB - Sample as sRGB texture.
+	///
+	/// @param _info Returns parsed DDS texture information.
+	/// @returns Texture handle.
 	TextureHandle createTexture(const Memory* _mem, uint32_t _flags = BGFX_TEXTURE_NONE, TextureInfo* _info = NULL);
 
 	/// Create 2D texture.