Module: wine Branch: refs/heads/master Commit: 851bdfb5e0ba3bf3b06122688fba82ad0729407a URL: http://source.winehq.org/git/?p=wine.git;a=commit;h=851bdfb5e0ba3bf3b0612268...
Author: Stefan Dösinger stefandoesinger@gmx.at Date: Wed Mar 8 00:11:28 2006 +0100
wined3d: Add D3DLOCK_* types to wined3d_types.h.
---
dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 4 ++-- dlls/wined3d/volume.c | 2 +- include/wine/wined3d_types.h | 7 +++++++ 5 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 409d5cb..b621ffd 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5719,7 +5719,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy if (srcWidth == destWidth && srcHeight == destHeight) { D3DLOCKED_RECT lrSrc; D3DLOCKED_RECT lrDst; - IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, NULL, WINED3DLOCK_READONLY); IWineD3DSurface_LockRect(pDestinationSurface, &lrDst, NULL, 0L); TRACE("Locked src and dst, Direct copy as surfaces are equal, w=%d, h=%d\n", srcWidth, srcHeight);
@@ -5759,7 +5759,7 @@ HRESULT WINAPI IWineD3DDeviceImpl_Copy copyperline = ((r->right - r->left) * bytesPerPixel); }
- IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(pSourceSurface, &lrSrc, r, WINED3DLOCK_READONLY); dest_rect.left = p->x; dest_rect.top = p->y; dest_rect.right = p->x + (r->right - r->left); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index bf5bc54..37d7453 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -2150,7 +2150,7 @@ void drawPrimitive(IWineD3DDevice *iface if (primCounter >= 0) { D3DLOCKED_RECT r; char buffer[80]; - IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, D3DLOCK_READONLY); + IWineD3DSurface_LockRect(This->renderTarget, &r, NULL, WINED3DLOCK_READONLY); sprintf(buffer, "/tmp/backbuffer_%ld.tga", primCounter); TRACE("Saving screenshot %s\n", buffer); IWineD3DSurface_SaveSnapshot(This->renderTarget, buffer); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cb1ab99..02d8a7e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -469,7 +469,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR } }
- } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&D3DLOCK_DISCARD)) { /* render surfaces */ + } else if (WINED3DUSAGE_RENDERTARGET & This->resource.usage && !(Flags&WINED3DLOCK_DISCARD)) { /* render surfaces */
GLint prev_store; GLint prev_read; @@ -631,7 +631,7 @@ HRESULT WINAPI IWineD3DSurfaceImpl_LockR FIXME("unsupported locking to surface surf@%p usage(%lu)\n", This, This->resource.usage); }
- if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { IWineD3DBaseTexture *pBaseTexture; diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 151ade3..d253e3c 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -191,7 +191,7 @@ HRESULT WINAPI IWineD3DVolumeImpl_LockBo This->lockedBox.Back = pBox->Back; }
- if (Flags & (D3DLOCK_NO_DIRTY_UPDATE | D3DLOCK_READONLY)) { + if (Flags & (WINED3DLOCK_NO_DIRTY_UPDATE | WINED3DLOCK_READONLY)) { /* Don't dirtify */ } else { /** diff --git a/include/wine/wined3d_types.h b/include/wine/wined3d_types.h index 75a9ee1..fc5ba17 100644 --- a/include/wine/wined3d_types.h +++ b/include/wine/wined3d_types.h @@ -906,4 +906,11 @@ typedef enum _WINED3DDECLUSAGE { #define WINED3DDEVCAPS_RTPATCHHANDLEZERO 0x000800000 #define WINED3DDEVCAPS_NPATCHES 0x001000000
+#define WINED3DLOCK_READONLY 0x0010 +#define WINED3DLOCK_NOSYSLOCK 0x0800 +#define WINED3DLOCK_NOOVERWRITE 0x1000 +#define WINED3DLOCK_DISCARD 0x2000 +#define WINED3DLOCK_DONOTWAIT 0x4000 +#define WINED3DLOCK_NO_DIRTY_UPDATE 0x8000 + #endif
-
Alexandre Julliard