Skip to content

W
wine-winehq
Commit 74cd90a1 authored by Ivan Gyurdiev's avatar Ivan Gyurdiev Committed by Alexandre Julliard
Browse files
Options

wined3d: D3DLOCK: Use consistently in the WINED3D namespace.

parent a8e5b9ae
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
dlls/wined3d/surface_gdi.c
View file @ 74cd90a1
......@@ -541,7 +541,7 @@ IWineGDISurfaceImpl_Blt(IWineD3DSurface *iface,
{
if (Src)
{
IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, D3DLOCK_READONLY);
IWineD3DSurface_LockRect(SrcSurface, &slock, NULL, WINED3DLOCK_READONLY);
sfmt = Src->resource.format;
}
sEntry = getFormatDescEntry(sfmt);
......@@ -1220,7 +1220,7 @@ IWineGDISurfaceImpl_BltFast(IWineD3DSurface *iface,
}
else
{
ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, D3DLOCK_READONLY);
ret = IWineD3DSurface_LockRect(Source, &slock, &lock_src, WINED3DLOCK_READONLY);
if(ret != D3D_OK) goto error;
ret = IWineD3DSurface_LockRect(iface, &dlock, &lock_dst, 0);
if(ret != D3D_OK) goto error;
......
dlls/wined3d/vertexbuffer.c
View file @ 74cd90a1
......@@ -451,9 +451,9 @@ static HRESULT WINAPI IWineD3DVertexBufferImpl_Lock(IWineD3DVertexBuffer *iface
TRACE("Locking directly into the buffer\n");
if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & D3DLOCK_DISCARD) ) {
if((This->resource.usage & WINED3DUSAGE_WRITEONLY) || ( Flags & WINED3DLOCK_DISCARD) ) {
mode = GL_WRITE_ONLY_ARB;
} else if( Flags & (D3DLOCK_READONLY | D3DLOCK_NO_DIRTY_UPDATE) ) {
} else if( Flags & (WINED3DLOCK_READONLY | WINED3DLOCK_NO_DIRTY_UPDATE) ) {
mode = GL_READ_ONLY_ARB;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment