From 1150c1558ea43f4240844e331e404a0ed55b539a Mon Sep 17 00:00:00 2001 From: Michael Mc Donnell Date: Fri, 19 Aug 2011 18:55:45 +0200 Subject: [PATCH] d3dx9: Use 0 instead of D3DLOCK_DISCARD in D3DXLoadMeshFromXInMemory. --- dlls/d3dx9_36/mesh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c index 24624225601..c5ad7b91d0e 100644 --- a/dlls/d3dx9_36/mesh.c +++ b/dlls/d3dx9_36/mesh.c @@ -3722,7 +3722,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_vertex_size = D3DXGetDeclVertexSize(concat_decl, 0); - hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, D3DLOCK_DISCARD, (void**)&concat_vertices); + hr = concat_mesh->lpVtbl->LockVertexBuffer(concat_mesh, 0, (void**)&concat_vertices); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) @@ -3775,7 +3775,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, concat_mesh->lpVtbl->UnlockVertexBuffer(concat_mesh); concat_vertices = NULL; - hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_indices); + hr = concat_mesh->lpVtbl->LockIndexBuffer(concat_mesh, 0, &concat_indices); if (FAILED(hr)) goto cleanup; index_offset = 0; @@ -3814,7 +3814,7 @@ HRESULT WINAPI D3DXLoadMeshFromXInMemory(LPCVOID memory, DWORD *concat_attrib_buffer = NULL; DWORD offset = 0; - hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, D3DLOCK_DISCARD, &concat_attrib_buffer); + hr = concat_mesh->lpVtbl->LockAttributeBuffer(concat_mesh, 0, &concat_attrib_buffer); if (FAILED(hr)) goto cleanup; LIST_FOR_EACH_ENTRY(container_ptr, &container_list, struct mesh_container, entry) -- 2.11.4.GIT