Mirrors/bgfx
1
0
Fork 0
mirror of https://github.com/bkaradzic/bgfx.git synced 2026-02-20 22:03:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #887 from nem0/master

Browse Source 
Fixed DDS texture arrays & updateTexture2D in D3D11
This commit is contained in:
Branimir Karadžić
2016-08-25 08:42:57 -07:00
committed by GitHub
parent f5ec9cae37 da08b8b993
commit cd5d8e2b97
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/image.cpp
View File

@@ -2793,6 +2793,7 @@ namespace bgfx
bx::skip(_reader, 4); // reserved
uint32_t dxgiFormat = 0;
uint32_t arraySize = 1;
if (DDPF_FOURCC == pixelFlags
&& DDS_DX10 == fourcc)
{
@@ -2804,7 +2805,6 @@ namespace bgfx
uint32_t miscFlags;
bx::read(_reader, miscFlags);
uint32_t arraySize;
bx::read(_reader, arraySize);
uint32_t miscFlags2;
@@ -2880,7 +2880,7 @@ namespace bgfx
_imageContainer.m_height = height;
_imageContainer.m_depth = depth;
_imageContainer.m_format = format;
_imageContainer.m_numLayers = 1;
_imageContainer.m_numLayers = arraySize;
_imageContainer.m_numMips = uint8_t( (caps[0] & DDSCAPS_MIPMAP) ? mips : 1);
_imageContainer.m_hasAlpha = hasAlpha;
_imageContainer.m_cubeMap = cubeMap;

2
src/renderer_d3d11.cpp
View File

@@ -4594,7 +4594,7 @@ BX_PRAGMA_DIAGNOSTIC_POP();
{
layer = _z * (TextureD3D11::TextureCube == m_type ? 6 : 1);
box.front = 0;
box.back = 0;
box.back = 1;
}
const uint32_t subres = _mip + ( (layer + _side) * m_numMips);