diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2014-05-14 18:43:38 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-14 18:43:38 +0200 |
| commit | 70cd276db01de8a9ccabb60282f00068b3840b88 (patch) | |
| tree | ffeae752c77d0e0074b59fe5c3c682d2842e459e /src/3rdparty | |
| parent | 800214f0b9cbbbc7b77a12180ce59033dd3cca64 (diff) | |
| parent | 3d4aeb791990f359e277efbfb0a1f1793945b55d (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/angle/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp index fdfbe526ec..0c981ac503 100644 --- a/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp +++ b/src/3rdparty/angle/src/libGLESv2/renderer/d3d11/TextureStorage11.cpp @@ -257,7 +257,7 @@ TextureStorage11_2D::TextureStorage11_2D(Renderer *renderer, int levels, GLenum D3D11_TEXTURE2D_DESC desc; desc.Width = width; // Compressed texture size constraints? desc.Height = height; - desc.MipLevels = (levels > 0) ? levels + mLodOffset : 0; + desc.MipLevels = mRenderer->getFeatureLevel() >= D3D_FEATURE_LEVEL_10_0 ? ((levels > 0) ? levels + mLodOffset : 0) : 1; desc.ArraySize = 1; desc.Format = mTextureFormat; desc.SampleDesc.Count = 1; |