ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3d9: Always allow read and write map access to non-DEFAULT buffers. 

D3d9 is very lax WRT map access to buffers and there isn't really much
of a reason for us to restrict read access to non-DEFAULT resources.

On the other hand, we'd still really like to be able to ensure that
DEFAULT, DYNAMIC | WRITEONLY buffers get allocated in the proper
memory region and get efficient data uploads, so keep the restriction
for DEFAULT resources.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46849
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Matteo Bruni 2019-05-13 20:34:18 +02:00 committed by Alexandre Julliard
parent 3724e9c4ab
commit 9d9dd8b378
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/d3d9/buffer.c
View File

@ -316,6 +316,9 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device *
desc.usage = usage & WINED3DUSAGE_MASK; desc.usage = usage & WINED3DUSAGE_MASK;
desc.bind_flags = 0; desc.bind_flags = 0;
desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage);
/* Buffers are always readable. */
if (pool != D3DPOOL_DEFAULT)
desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
desc.misc_flags = 0; desc.misc_flags = 0;
desc.structure_byte_stride = 0; desc.structure_byte_stride = 0;
@ -639,6 +642,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de
desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL;
desc.bind_flags = 0; desc.bind_flags = 0;
desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage);
/* Buffers are always readable. */
if (pool != D3DPOOL_DEFAULT)
desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W;
desc.misc_flags = 0; desc.misc_flags = 0;
desc.structure_byte_stride = 0; desc.structure_byte_stride = 0;