rooty/dxvk
1
0
Fork 0
mirror of https://github.com/doitsujin/dxvk.git synced 2025-02-01 08:52:11 +01:00
Code Issues Projects Releases Wiki Activity

[d3d9] Add volume texture creation and locking validations

Browse Source
This commit is contained in:
WinterSnowfall 2024-10-11 23:46:29 +03:00 committed by Philip Rebohle
parent a323abe085
commit 63d9affdcb
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/d3d9/d3d9_common_texture.cpp
View File

@ -183,6 +183,12 @@ namespace dxvk {
if (pDesc->Pool != D3DPOOL_DEFAULT && (pDesc->Usage & incompatibleUsages)) if (pDesc->Pool != D3DPOOL_DEFAULT && (pDesc->Usage & incompatibleUsages))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
// Volume textures in D3DPOOL_SCRATCH must not have DYNAMIC usage
if (ResourceType == D3DRTYPE_VOLUMETEXTURE
&& pDesc->Pool == D3DPOOL_SCRATCH
&& (pDesc->Usage & D3DUSAGE_DYNAMIC))
return D3DERR_INVALIDCALL;
// Use the maximum possible mip level count if the supplied // Use the maximum possible mip level count if the supplied
// mip level count is either unspecified (0) or invalid // mip level count is either unspecified (0) or invalid
const uint32_t maxMipLevelCount = pDesc->MultiSample <= D3DMULTISAMPLE_NONMASKABLE const uint32_t maxMipLevelCount = pDesc->MultiSample <= D3DMULTISAMPLE_NONMASKABLE

6
src/d3d9/d3d9_device.cpp
View File

@ -687,10 +687,10 @@ namespace dxvk {
desc.IsAttachmentOnly = FALSE; desc.IsAttachmentOnly = FALSE;
// Docs: // Docs:
// Textures placed in the D3DPOOL_DEFAULT pool cannot be locked // Textures placed in the D3DPOOL_DEFAULT pool cannot be locked
// unless they are dynamic textures or they are private, FOURCC, driver formats. // unless they are dynamic textures. Volume textures do not
// exempt private, FOURCC, driver formats from these checks.
desc.IsLockable = Pool != D3DPOOL_DEFAULT desc.IsLockable = Pool != D3DPOOL_DEFAULT
|| (Usage & D3DUSAGE_DYNAMIC) || (Usage & D3DUSAGE_DYNAMIC);
|| IsVendorFormat(EnumerateFormat(Format));
if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_VOLUMETEXTURE, &desc))) if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_VOLUMETEXTURE, &desc)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;