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

d3d9: Explicitly translate resource map flags. 

Signed-off-by: Henri Verbeet <hverbeet@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Henri Verbeet 2018-02-16 09:39:07 +03:30 committed by Alexandre Julliard
parent 8a1a94cd20
commit b5d0cad40d
5 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dlls/d3d9/buffer.c
View File

@ -194,7 +194,7 @@ static HRESULT WINAPI d3d9_vertexbuffer_Lock(IDirect3DVertexBuffer9 *iface, UINT
wined3d_box.right = offset + size;
wined3d_mutex_lock();
hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer),
0, &wined3d_map_desc, &wined3d_box, flags);
0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags));
wined3d_mutex_unlock();
*data = wined3d_map_desc.data;
@ -490,7 +490,7 @@ static HRESULT WINAPI d3d9_indexbuffer_Lock(IDirect3DIndexBuffer9 *iface,
wined3d_box.right = offset + size;
wined3d_mutex_lock();
hr = wined3d_resource_map(wined3d_buffer_get_resource(buffer->wined3d_buffer),
0, &wined3d_map_desc, &wined3d_box, flags);
0, &wined3d_map_desc, &wined3d_box, wined3dmapflags_from_d3dmapflags(flags));
wined3d_mutex_unlock();
*data = wined3d_map_desc.data;

1
dlls/d3d9/d3d9_private.h
View File

@ -56,6 +56,7 @@ HRESULT vdecl_convert_fvf(DWORD FVF, D3DVERTEXELEMENT9 **ppVertexElements) DECLS
D3DFORMAT d3dformat_from_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN;
BOOL is_gdi_compat_wined3dformat(enum wined3d_format_id format) DECLSPEC_HIDDEN;
enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format) DECLSPEC_HIDDEN;
unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags) DECLSPEC_HIDDEN;
void present_parameters_from_wined3d_swapchain_desc(D3DPRESENT_PARAMETERS *present_parameters,
const struct wined3d_swapchain_desc *swapchain_desc) DECLSPEC_HIDDEN;
void d3dcaps_from_wined3dcaps(D3DCAPS9 *caps, const WINED3DCAPS *wined3d_caps) DECLSPEC_HIDDEN;

19
dlls/d3d9/device.c
View File

@ -160,6 +160,25 @@ enum wined3d_format_id wined3dformat_from_d3dformat(D3DFORMAT format)
}
}
unsigned int wined3dmapflags_from_d3dmapflags(unsigned int flags)
{
static const unsigned int handled = D3DLOCK_READONLY
| D3DLOCK_NOSYSLOCK
| D3DLOCK_NOOVERWRITE
| D3DLOCK_DISCARD
| D3DLOCK_DONOTWAIT
| D3DLOCK_NO_DIRTY_UPDATE;
unsigned int wined3d_flags;
wined3d_flags = flags & handled;
flags &= ~handled;
if (flags)
FIXME("Unhandled flags %#x.\n", flags);
return wined3d_flags;
}
static UINT vertex_count_from_primitive_count(D3DPRIMITIVETYPE primitive_type, UINT primitive_count)
{
switch (primitive_type)

2
dlls/d3d9/surface.c
View File

@ -249,7 +249,7 @@ static HRESULT WINAPI d3d9_surface_LockRect(IDirect3DSurface9 *iface,
wined3d_mutex_lock();
hr = wined3d_resource_map(wined3d_texture_get_resource(surface->wined3d_texture), surface->sub_resource_idx,
&map_desc, rect ? &box : NULL, flags);
&map_desc, rect ? &box : NULL, wined3dmapflags_from_d3dmapflags(flags));
wined3d_mutex_unlock();
if (SUCCEEDED(hr))

3
dlls/d3d9/volume.c
View File

@ -147,7 +147,8 @@ static HRESULT WINAPI d3d9_volume_LockBox(IDirect3DVolume9 *iface,
wined3d_mutex_lock();
if (FAILED(hr = wined3d_resource_map(wined3d_texture_get_resource(volume->wined3d_texture),
volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box, flags)))
volume->sub_resource_idx, &map_desc, (const struct wined3d_box *)box,
wined3dmapflags_from_d3dmapflags(flags))))
map_desc.data = NULL;
wined3d_mutex_unlock();