Fixed a bug where the wrong number of mip levels would be generated if levels…

Fixed a bug where the wrong number of mip levels would be generated if levels was zero and the lod offset was non-zero. TRAC #13332 Signed-off-by: Jamie Madill Signed-off-by: Shannon Woods Author: Geoff Lang git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1970 736b8ea6-26fd-11df-bfd4-992fa37f6226
parent 2507278c
...@@ -263,7 +263,7 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum ...@@ -263,7 +263,7 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum
D3D11_TEXTURE2D_DESC desc; D3D11_TEXTURE2D_DESC desc;
desc.Width = width; // Compressed texture size constraints? desc.Width = width; // Compressed texture size constraints?
desc.Height = height; desc.Height = height;
desc.MipLevels = levels + mLodOffset; desc.MipLevels = (levels > 0) ? levels + mLodOffset : 0;
desc.ArraySize = 1; desc.ArraySize = 1;
desc.Format = mTextureFormat; desc.Format = mTextureFormat;
desc.SampleDesc.Count = 1; desc.SampleDesc.Count = 1;
...@@ -485,7 +485,7 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe ...@@ -485,7 +485,7 @@ TextureStorage11_Cube::TextureStorage11_Cube(Renderer *renderer, int levels, GLe
D3D11_TEXTURE2D_DESC desc; D3D11_TEXTURE2D_DESC desc;
desc.Width = size; desc.Width = size;
desc.Height = size; desc.Height = size;
desc.MipLevels = levels + mLodOffset; desc.MipLevels = (levels > 0) ? levels + mLodOffset : 0;
desc.ArraySize = 6; desc.ArraySize = 6;
desc.Format = mTextureFormat; desc.Format = mTextureFormat;
desc.SampleDesc.Count = 1; desc.SampleDesc.Count = 1;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment