diff options
| author | Mat M <mathew1800@gmail.com> | 2016-12-23 04:33:42 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 04:33:42 -0500 |
| commit | 9160be50dbfa31073eda0148378786f69b219805 (patch) | |
| tree | 579bca3b98e8dd47ec3b18911504a669a2853cf9 /Source/Core/VideoBackends/D3D/TextureCache.cpp | |
| parent | f2322bee90c1bd973a6cc4e99d4df78c7d2d0027 (diff) | |
| parent | 58a53951735aba77899ea8f8910a6b68dc52449a (diff) | |
Merge pull request #4224 from lioncash/tcache
TextureCacheBase: Eliminate static state
Diffstat (limited to 'Source/Core/VideoBackends/D3D/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/TextureCache.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index 0fa7ec873c..55694dd1b8 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -127,12 +127,11 @@ void TextureCache::TCacheEntry::CopyRectangleFromTexture(const TCacheEntryBase* g_renderer->RestoreAPIState(); } -void TextureCache::TCacheEntry::Load(unsigned int width, unsigned int height, - unsigned int expanded_width, unsigned int level) +void TextureCache::TCacheEntry::Load(const u8* buffer, u32 width, u32 height, u32 expanded_width, + u32 level) { unsigned int src_pitch = 4 * expanded_width; - D3D::ReplaceRGBATexture2D(texture->GetTex(), TextureCache::temp, width, height, src_pitch, level, - usage); + D3D::ReplaceRGBATexture2D(texture->GetTex(), buffer, width, height, src_pitch, level, usage); } TextureCacheBase::TCacheEntryBase* TextureCache::CreateTexture(const TCacheEntryConfig& config) |
