MAME SVN History

199869 Revisions

r35053 Sunday 15th February, 2015 at 19:15:27 UTC by Miodrag Milanović
Sync with latest BGFX and BX (nw)

[3rdparty/bgfx/3rdparty/ib-compress]	readbitstream.h
[3rdparty/bgfx/examples/common/font]	font_manager.cpp
[3rdparty/bgfx/src]	image.cpp
[3rdparty/bx/include/bx]	macros.h

trunk/3rdparty/bgfx/3rdparty/ib-compress/readbitstream.h
r243564	r243565
95	95	}
96	96	}
97	97
98		#if defined(__GNUC__) \|\| defined(_MSC_VER)
99		#define U64(val) val##ULL
100		#else
101		#define U64(val) val
102		#endif
103
104	98	RBS_INLINE uint32_t ReadBitstream::Read( uint32_t bitCount )
105	99	{
106	100	uint64_t mask = ( uint64_t( 1 ) << bitCount ) - 1;
107		uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : U64(0xFFFFFFFFFFFFFFFF) ) ) & mask );
	101	uint32_t result = static_cast< uint32_t >( ( m_bitBuffer >> ( 64 - m_bitsLeft ) & ( m_bitsLeft == 0 ? 0 : UINT64_C(0xFFFFFFFFFFFFFFFF) ) ) & mask );
108	102
109	103	if ( m_bitsLeft < bitCount )
110	104	{

trunk/3rdparty/bgfx/examples/common/font/font_manager.cpp
r243564	r243565
13	13
14	14	BX_PRAGMA_DIAGNOSTIC_PUSH();
15	15	BX_PRAGMA_DIAGNOSTIC_IGNORED_MSVC(4245) // error C4245: '=' : conversion from 'int' to 'FT_UInt', signed/unsigned mismatch
16		#if ~~defined(~~_MSC_VER) \|\| ~~(defined(~~_~~_GNU~~C~~__) && (__GNUC__ == 4) && (__GNUC_~~MINOR__ >= 3))
	16	#if BX_COMPILER_MSVC \|\| BX_COMPILER_GCC >= 40300
17	17	#pragma push_macro("interface")
18	18	#endif
19	19	#undef interface
20	20	#include <freetype/freetype.h>
21		#if ~~defined(~~_MSC_VER) \|\| ~~(defined(~~_~~_GNU~~C~~__) && (__GNUC__ == 4) && (__GNUC_~~MINOR__ >= 3))
	21	#if BX_COMPILER_MSVC \|\| BX_COMPILER_GCC >= 40300
22	22	#pragma pop_macro("interface")
23	23	#endif
24	24	BX_PRAGMA_DIAGNOSTIC_POP();

trunk/3rdparty/bgfx/src/image.cpp
r243564	r243565
1391	1391
1392	1392	static TranslateDdsPixelFormat s_translateDdsPixelFormat[] =
1393	1393	{
	1394	{ 8, { 0x000000ff, 0x00000000, 0x00000000, 0x00000000 }, TextureFormat::R8 },
	1395	{ 16, { 0x0000ffff, 0x00000000, 0x00000000, 0x00000000 }, TextureFormat::R16 },
	1396	{ 16, { 0x00000f00, 0x000000f0, 0x0000000f, 0x0000f000 }, TextureFormat::RGBA4 },
	1397	{ 16, { 0x0000f800, 0x000007e0, 0x0000001f, 0x00000000 }, TextureFormat::R5G6B5 },
	1398	{ 16, { 0x00007c00, 0x000003e0, 0x0000001f, 0x00008000 }, TextureFormat::RGB5A1 },
1394	1399	{ 32, { 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000 }, TextureFormat::BGRA8 },
1395	1400	{ 32, { 0x00ff0000, 0x0000ff00, 0x000000ff, 0x00000000 }, TextureFormat::BGRA8 },
1396	1401	{ 32, { 0x000003ff, 0x000ffc00, 0x3ff00000, 0xc0000000 }, TextureFormat::RGB10A2 },

trunk/3rdparty/bx/include/bx/macros.h
r243564	r243565
138	138	# define BX_PRAGMA_DIAGNOSTIC_IGNORED_CLANG(_x)
139	139	#endif // BX_COMPILER_CLANG
140	140
141		#if BX_COMPILER_GCC && (_~~_GNU~~C~~__ == 4) && (__GNUC_~~MINOR__ >= 6)
	141	#if BX_COMPILER_GCC && BX_COMPILER_GCC >= 40600
142	142	# define BX_PRAGMA_DIAGNOSTIC_PUSH_GCC() _Pragma("GCC diagnostic push")
143	143	# define BX_PRAGMA_DIAGNOSTIC_POP_GCC() _Pragma("GCC diagnostic pop")
144	144	# define BX_PRAGMA_DIAGNOSTIC_IGNORED_GCC(_x) _Pragma(BX_STRINGIZE(GCC diagnostic ignored _x) )
r243564	r243565
173	173	#endif // BX_COMPILER_
174	174
175	175	///
176		#if ~~defined(~~__GNUC~~__)~~ && defined(__is_pod)
	176	#if BX_COMPILER_GCC && defined(__is_pod)
177	177	# define BX_TYPE_IS_POD(t) __is_pod(t)
178		#elif ~~defined(~~_MSC_VER)
	178	#elif BX_COMPILER_MSVC
179	179	# define BX_TYPE_IS_POD(t) (!__is_class(t) \|\| __is_pod(t))
180	180	#else
181	181	# define BX_TYPE_IS_POD(t) false

199869 Revisions