diff options
| author | Matthew Parlane <parlane@gmail.com> | 2013-02-23 17:02:58 +1300 |
|---|---|---|
| committer | Matthew Parlane <parlane@gmail.com> | 2013-02-23 17:02:58 +1300 |
| commit | c30b8c9eae8a72747bf7da77f40f20b35c3d712a (patch) | |
| tree | 5fbb01b93f8dff848936132b6e2fac964bbac7e4 /Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | |
| parent | 3d480c088fa27c6dcadef40042a0e8deb3093985 (diff) | |
| parent | ba979582e2d0b4961f1087b76eef659856eb23bb (diff) | |
Merge branch 'master' into wii-network
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Diffstat (limited to 'Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp')
| -rw-r--r-- | Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp index 844cf24b47..c0474e5c67 100644 --- a/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp +++ b/Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp @@ -98,6 +98,9 @@ TextureCache::TCacheEntryBase* TextureCache::CreateTexture(unsigned int width, D3D::SetDebugObjectName((ID3D11DeviceChild*)entry->texture->GetSRV(), "shader resource view of a texture of the TextureCache"); SAFE_RELEASE(pTexture); + + if (tex_levels != 1) + entry->Load(width, height, expanded_width, 0); return entry; } |