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

[d3d9] Expand NormalizeTextureProperties validations

Browse Source
This commit is contained in:
WinterSnowfall 2024-11-20 19:47:55 +02:00 committed by Robin Kertels
parent 97ad37e409
commit 9e1bc1db23
2 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/d3d9/d3d9_common_texture.cpp
View File

@ -178,9 +178,38 @@ namespace dxvk {
if (pDesc->Usage & D3DUSAGE_WRITEONLY) if (pDesc->Usage & D3DUSAGE_WRITEONLY)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
constexpr DWORD usageRTOrDS = D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL;
// RENDERTARGET and DEPTHSTENCIL must be default pool // RENDERTARGET and DEPTHSTENCIL must be default pool
constexpr DWORD incompatibleUsages = D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL; if (pDesc->Pool != D3DPOOL_DEFAULT && (pDesc->Usage & usageRTOrDS))
if (pDesc->Pool != D3DPOOL_DEFAULT && (pDesc->Usage & incompatibleUsages)) return D3DERR_INVALIDCALL;
// RENDERTARGET and DEPTHSTENCIL in D3DPOOL_DEFAULT
// can not also have DYNAMIC usage
if (pDesc->Pool == D3DPOOL_DEFAULT &&
(pDesc->Usage & usageRTOrDS) &&
(pDesc->Usage & D3DUSAGE_DYNAMIC))
return D3DERR_INVALIDCALL;
const bool isPlainSurface = ResourceType == D3DRTYPE_SURFACE && !(pDesc->Usage & usageRTOrDS);
const bool isDepthStencilFormat = IsDepthStencilFormat(pDesc->Format);
// With the exception of image surfaces (d3d8)
// or plain offscreen surfaces (d3d9), depth stencil
// formats can only be used in D3DPOOL_DEFAULT
if (!isPlainSurface && pDesc->Pool != D3DPOOL_DEFAULT && isDepthStencilFormat)
return D3DERR_INVALIDCALL;
// Depth stencil formats can not have RENDERTARGET
// usage, and nothing except depth stencil formats
// can have DEPTHSTENCIL usage
if (( isDepthStencilFormat && (pDesc->Usage & D3DUSAGE_RENDERTARGET)) ||
(!isDepthStencilFormat && (pDesc->Usage & D3DUSAGE_DEPTHSTENCIL)))
return D3DERR_INVALIDCALL;
// Volume textures can not be used as render targets
if (ResourceType == D3DRTYPE_VOLUMETEXTURE &&
(pDesc->Usage & D3DUSAGE_RENDERTARGET))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
// Volume textures in D3DPOOL_SCRATCH must not have DYNAMIC usage // Volume textures in D3DPOOL_SCRATCH must not have DYNAMIC usage
@ -202,13 +231,13 @@ namespace dxvk {
pDesc->MipLevels = maxMipLevelCount; pDesc->MipLevels = maxMipLevelCount;
if (unlikely(pDesc->Discard)) { if (unlikely(pDesc->Discard)) {
if (!IsDepthStencilFormat(pDesc->Format)) if (!isDepthStencilFormat)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (pDesc->Format == D3D9Format::D32_LOCKABLE if (pDesc->Format == D3D9Format::D32_LOCKABLE
|| pDesc->Format == D3D9Format::D32F_LOCKABLE || pDesc->Format == D3D9Format::D32F_LOCKABLE
|| pDesc->Format == D3D9Format::D16_LOCKABLE || pDesc->Format == D3D9Format::D16_LOCKABLE
|| pDesc->Format == D3D9Format::S8_LOCKABLE) || pDesc->Format == D3D9Format::S8_LOCKABLE)
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
} }

8
src/d3d9/d3d9_device.cpp
View File

@ -4070,7 +4070,7 @@ namespace dxvk {
desc.IsAttachmentOnly = TRUE; desc.IsAttachmentOnly = TRUE;
desc.IsLockable = Lockable; desc.IsLockable = Lockable;
if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_TEXTURE, &desc))) if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_SURFACE, &desc)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
try { try {
@ -4118,7 +4118,7 @@ namespace dxvk {
// Docs: Off-screen plain surfaces are always lockable, regardless of their pool types. // Docs: Off-screen plain surfaces are always lockable, regardless of their pool types.
desc.IsLockable = TRUE; desc.IsLockable = TRUE;
if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_TEXTURE, &desc))) if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_SURFACE, &desc)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
if (pSharedHandle != nullptr && Pool != D3DPOOL_DEFAULT) if (pSharedHandle != nullptr && Pool != D3DPOOL_DEFAULT)
@ -4172,7 +4172,7 @@ namespace dxvk {
desc.IsAttachmentOnly = TRUE; desc.IsAttachmentOnly = TRUE;
desc.IsLockable = IsLockableDepthStencilFormat(desc.Format); desc.IsLockable = IsLockableDepthStencilFormat(desc.Format);
if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_TEXTURE, &desc))) if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_SURFACE, &desc)))
return D3DERR_INVALIDCALL; return D3DERR_INVALIDCALL;
try { try {
@ -8362,7 +8362,7 @@ namespace dxvk {
desc.IsAttachmentOnly = TRUE; desc.IsAttachmentOnly = TRUE;
desc.IsLockable = IsLockableDepthStencilFormat(desc.Format); desc.IsLockable = IsLockableDepthStencilFormat(desc.Format);
if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_TEXTURE, &desc))) if (FAILED(D3D9CommonTexture::NormalizeTextureProperties(this, D3DRTYPE_SURFACE, &desc)))
return D3DERR_NOTAVAILABLE; return D3DERR_NOTAVAILABLE;
m_autoDepthStencil = new D3D9Surface(this, &desc, nullptr, nullptr); m_autoDepthStencil = new D3D9Surface(this, &desc, nullptr, nullptr);