Michael Mc Donnell : d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof.
Alexandre Julliard
julliard at winehq.org
Wed Aug 31 13:19:21 CDT 2011
Module: wine
Branch: master
Commit: 41b6f4aec16a81896a0c5394071fcda86b9e91e0
URL: http://source.winehq.org/git/wine.git/?a=commit;h=41b6f4aec16a81896a0c5394071fcda86b9e91e0
Author: Michael Mc Donnell <michael at mcdonnell.dk>
Date: Fri Aug 19 17:21:30 2011 +0200
d3dx9: Use 0 instead of D3DLOCK_DISCARD in load_skin_mesh_from_xof.
---
dlls/d3dx9_36/mesh.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/dlls/d3dx9_36/mesh.c b/dlls/d3dx9_36/mesh.c
index ed42883..2462422 100644
--- a/dlls/d3dx9_36/mesh.c
+++ b/dlls/d3dx9_36/mesh.c
@@ -2966,7 +2966,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata,
hr = D3DXCreateMeshFVF(mesh_data.num_tri_faces, total_vertices, options, mesh_data.fvf, device, &d3dxmesh);
if (FAILED(hr)) goto cleanup;
- hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, D3DLOCK_DISCARD, &vertices);
+ hr = d3dxmesh->lpVtbl->LockVertexBuffer(d3dxmesh, 0, &vertices);
if (FAILED(hr)) goto cleanup;
out_ptr = vertices;
@@ -3008,7 +3008,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata,
}
d3dxmesh->lpVtbl->UnlockVertexBuffer(d3dxmesh);
- hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, D3DLOCK_DISCARD, (void**)&indices);
+ hr = d3dxmesh->lpVtbl->LockIndexBuffer(d3dxmesh, 0, (void**)&indices);
if (FAILED(hr)) goto cleanup;
index_in_ptr = mesh_data.indices;
@@ -3037,7 +3037,7 @@ static HRESULT load_skin_mesh_from_xof(IDirectXFileData *filedata,
if (mesh_data.material_indices) {
DWORD *attrib_buffer = NULL;
- hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, D3DLOCK_DISCARD, &attrib_buffer);
+ hr = d3dxmesh->lpVtbl->LockAttributeBuffer(d3dxmesh, 0, &attrib_buffer);
if (FAILED(hr)) goto cleanup;
for (i = 0; i < mesh_data.num_poly_faces; i++)
{
More information about the wine-cvs
mailing list