mirrors
/
dxvk
mirror of https://github.com/doitsujin/dxvk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[d3d9] UpdateTexture: Handle automatic mip gen properly

This commit is contained in:
Robin Kertels 2022-03-21 13:40:03 +01:00 committed by Joshie
parent 119c1ececb
commit b2f22d5719
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/d3d9/d3d9_device.cpp
View File

@ -793,14 +793,17 @@ namespace dxvk {
if (unlikely(srcTexInfo->Desc()->Pool != D3DPOOL_SYSTEMMEM || dstTexInfo->Desc()->Pool != D3DPOOL_DEFAULT))
return D3DERR_INVALIDCALL;
if (srcTexInfo->Desc()->MipLevels < dstTexInfo->Desc()->MipLevels)
if (unlikely(srcTexInfo->Desc()->MipLevels < dstTexInfo->Desc()->MipLevels && !dstTexInfo->IsAutomaticMip()))
return D3DERR_INVALIDCALL;
if (dstTexInfo->Desc()->Format != srcTexInfo->Desc()->Format)
if (unlikely(dstTexInfo->Desc()->Format != srcTexInfo->Desc()->Format))
return D3DERR_INVALIDCALL;
if (unlikely(srcTexInfo->IsAutomaticMip() && !dstTexInfo->IsAutomaticMip()))
return D3DERR_INVALIDCALL;
const Rc<DxvkImage> dstImage = dstTexInfo->GetImage();
uint32_t mipLevels = dstTexInfo->Desc()->MipLevels;
uint32_t mipLevels = dstTexInfo->IsAutomaticMip() ? 1 : dstTexInfo->Desc()->MipLevels;
uint32_t arraySlices = std::min(srcTexInfo->Desc()->ArraySize, dstTexInfo->Desc()->ArraySize);
uint32_t srcMipOffset = srcTexInfo->Desc()->MipLevels - mipLevels;
@ -809,12 +812,6 @@ namespace dxvk {
if (srcFirstMipExtent != dstFirstMipExtent)
return D3DERR_INVALIDCALL;
if (unlikely(srcTexInfo->IsAutomaticMip() && !dstTexInfo->IsAutomaticMip()))
return D3DERR_INVALIDCALL;
if (dstTexInfo->IsAutomaticMip())
mipLevels = 1;
for (uint32_t a = 0; a < arraySlices; a++) {
const D3DBOX& box = srcTexInfo->GetDirtyBox(a);
if (box.Left >= box.Right || box.Top >= box.Bottom || box.Front >= box.Back)