diff options
| author | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
|---|---|---|
| committer | magumagu <magumagu9@gmail.com> | 2015-03-16 11:50:42 -0700 |
| commit | adb8bbed900bccf7e7fbfa5e79d3262bede18e21 (patch) | |
| tree | e32c61e43c53fdb73c00b18de3be109b2f0bd722 /Source/Core/VideoBackends/D3D/TextureCache.cpp | |
| parent | 0b6562b53f2d315bfc88d943658c05f75cd8fc2a (diff) | |
| parent | ad64336137013a823c212e4e491dbb435aa11e5f (diff) | |
Merge pull request #2217 from shuffle2/quiet-warnings
quiet some warnings which appear on vs2015.
Diffstat (limited to 'Source/Core/VideoBackends/D3D/TextureCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/D3D/TextureCache.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Source/Core/VideoBackends/D3D/TextureCache.cpp b/Source/Core/VideoBackends/D3D/TextureCache.cpp index b13397be38..92293bdac9 100644 --- a/Source/Core/VideoBackends/D3D/TextureCache.cpp +++ b/Source/Core/VideoBackends/D3D/TextureCache.cpp @@ -65,7 +65,7 @@ bool TextureCache::TCacheEntry::Save(const std::string& filename, unsigned int l D3D::context->CopyResource(pNewTexture, pSurface); D3D11_MAPPED_SUBRESOURCE map; - HRESULT hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map); + hr = D3D::context->Map(pNewTexture, 0, D3D11_MAP_READ_WRITE, 0, &map); if (SUCCEEDED(hr)) { saved_png = TextureToPng((u8*)map.pData, map.RowPitch, filename, desc.Width, desc.Height); @@ -177,13 +177,11 @@ void TextureCache::TCacheEntry::FromRenderTarget(u32 dstAddr, unsigned int dstFo u8* dst = Memory::GetPointer(dstAddr); size_t encoded_size = g_encoder->Encode(dst, dstFormat, srcFormat, srcRect, isIntensity, scaleByHalf); - u64 hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); - size_in_bytes = (u32)encoded_size; TextureCache::MakeRangeDynamic(dstAddr, (u32)encoded_size); - this->hash = hash; + this->hash = GetHash64(dst, (int)encoded_size, g_ActiveConfig.iSafeTextureCache_ColorSamples); } } |