Fixed DX11.

This commit is contained in:
bkaradzic 2013-11-16 10:58:15 -08:00
parent 40c9aa78d8
commit 304683d839
2 changed files with 6 additions and 3 deletions

View file

@ -412,6 +412,8 @@ namespace bgfx
D3D_FEATURE_LEVEL features[] =
{
D3D_FEATURE_LEVEL_11_0,
D3D_FEATURE_LEVEL_10_1,
D3D_FEATURE_LEVEL_10_0,
};
memset(&m_scd, 0, sizeof(m_scd) );
@ -1712,11 +1714,12 @@ namespace bgfx
if (convert)
{
uint32_t srcpitch = mip.m_width*bpp/8;
uint8_t* temp = (uint8_t*)BX_ALLOC(g_allocator, mip.m_width*mip.m_height*bpp/8);
imageDecodeToBgra8(temp, mip.m_data, mip.m_width, mip.m_height, mip.m_format);
imageDecodeToBgra8(temp, mip.m_data, mip.m_width, mip.m_height, srcpitch, mip.m_format);
srd[kk].pSysMem = temp;
srd[kk].SysMemPitch = mip.m_width*bpp/8;
srd[kk].SysMemPitch = srcpitch;
}
else if (TextureFormat::Unknown > m_textureFormat)
{

View file

@ -258,7 +258,7 @@ namespace bgfx
void create(const Memory* _mem, uint32_t _flags);
void destroy();
void update(uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, const Memory* _mem);
void update(uint8_t _side, uint8_t _mip, const Rect& _rect, uint16_t _z, uint16_t _depth, uint16_t _pitch, const Memory* _mem);
void commit(uint8_t _stage, uint32_t _flags = BGFX_SAMPLER_DEFAULT_FLAGS);
union