Module: wine Branch: master Commit: 6db6df95dca516d049f9a21cf7265248d2508245 URL: https://gitlab.winehq.org/wine/wine/-/commit/6db6df95dca516d049f9a21cf726524...
Author: Zebediah Figura zfigura@codeweavers.com Date: Fri Jul 29 14:15:57 2022 -0500
d3d8: Introduce a wined3d_usage_from_d3d() helper.
---
dlls/d3d8/buffer.c | 4 ++-- dlls/d3d8/d3d8_private.h | 8 ++++++++ dlls/d3d8/texture.c | 13 +++---------- 3 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 463ea93e17c..1b5098c64c9 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -296,7 +296,7 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * buffer->usage = usage;
desc.byte_width = size; - desc.usage = usage & WINED3DUSAGE_MASK; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ @@ -600,7 +600,7 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de return D3DERR_INVALIDCALL;
desc.byte_width = size; - desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); /* Buffers are always readable. */ diff --git a/dlls/d3d8/d3d8_private.h b/dlls/d3d8/d3d8_private.h index da701a2a8d3..0fb3bd5b73e 100644 --- a/dlls/d3d8/d3d8_private.h +++ b/dlls/d3d8/d3d8_private.h @@ -353,6 +353,14 @@ static inline unsigned int wined3daccess_from_d3dpool(D3DPOOL pool, unsigned int return access; }
+static inline unsigned int wined3d_usage_from_d3d(D3DPOOL pool, DWORD usage) +{ + usage &= WINED3DUSAGE_MASK; + if (pool == D3DPOOL_SCRATCH) + usage |= WINED3DUSAGE_SCRATCH; + return usage; +} + static inline unsigned int wined3d_bind_flags_from_d3d8_usage(DWORD usage) { unsigned int bind_flags = 0; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index f383b374bde..5f96336f2d8 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1105,9 +1105,7 @@ HRESULT texture_init(struct d3d8_texture *texture, struct d3d8_device *device, desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width; @@ -1158,10 +1156,7 @@ HRESULT cubetexture_init(struct d3d8_texture *texture, struct d3d8_device *devic desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - desc.usage |= WINED3DUSAGE_LEGACY_CUBEMAP; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage) | WINED3DUSAGE_LEGACY_CUBEMAP; desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = edge_length; @@ -1216,9 +1211,7 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev desc.format = wined3dformat_from_d3dformat(format); desc.multisample_type = WINED3D_MULTISAMPLE_NONE; desc.multisample_quality = 0; - desc.usage = usage & WINED3DUSAGE_MASK; - if (pool == D3DPOOL_SCRATCH) - desc.usage |= WINED3DUSAGE_SCRATCH; + desc.usage = wined3d_usage_from_d3d(pool, usage); desc.bind_flags = wined3d_bind_flags_from_d3d8_usage(usage) | WINED3D_BIND_SHADER_RESOURCE; desc.access = wined3daccess_from_d3dpool(pool, usage); desc.width = width;