February 2007 - Wine-Commits

Stefan Dösinger : wined3d: Swap the SFLAG_DIBSECTION flag when swaping hdc and memory.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: ae3327334da6fdb9adcf7d27be387c089b7ffdae URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae3327334da6fdb9adcf7d27b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:25:48 2007 +0100 wined3d: Swap the SFLAG_DIBSECTION flag when swaping hdc and memory. --- dlls/wined3d/swapchain.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 00f36de..52271df 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -305,9 +305,15 @@ static HRESULT WINAPI IWineD3DSwapChainImpl_Present(IWineD3DSwapChain *iface, CO /* Flip the DIBsection */ { HBITMAP tmp; + BOOL hasDib = front->Flags & SFLAG_DIBSECTION; tmp = front->dib.DIBsection; front->dib.DIBsection = back->dib.DIBsection; back->dib.DIBsection = tmp; + + if(back->Flags & SFLAG_DIBSECTION) front->Flags |= SFLAG_DIBSECTION; + else front->Flags &= ~SFLAG_DIBSECTION; + if(hasDib) back->Flags |= SFLAG_DIBSECTION; + else back->Flags &= ~SFLAG_DIBSECTION; } /* Flip the surface data */

1 0

Stefan Dösinger : wined3d: Do not allocate compressed surfaces with glTexImage2D.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: b90a665d2049d0b2744886395bec3a8d215aaa80 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b90a665d2049d0b2744886395… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:28:25 2007 +0100 wined3d: Do not allocate compressed surfaces with glTexImage2D. --- dlls/wined3d/surface.c | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ffdc55d..149ec02 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -168,8 +168,12 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLsizei width, GLsize } else { TRACE("(%p) : Calling glCompressedTexSubImage2D w %d, h %d, data %p\n", This, width, height, data); ENTER_GL(); - GL_EXTCALL(glCompressedTexSubImage2DARB(This->glDescription.target, This->glDescription.level, 0, 0, width, height, - This->glDescription.glFormatInternal, This->resource.size, data)); + /* glCompressedTexSubImage2D for uploading and glTexImage2D for allocating does not work well on some drivers(r200 dri, MacOS ATI driver) + * glCompressedTexImage2D does not accept NULL pointers. So for compressed textures surface_allocate_surface does nothing, and this + * function uses glCompressedTexImage2D instead of the SubImage call + */ + GL_EXTCALL(glCompressedTexImage2DARB(This->glDescription.target, This->glDescription.level, This->glDescription.glFormatInternal, + width, height, 0 /* border */, This->resource.size, data)); checkGLcall("glCompressedTexSubImage2D"); LEAVE_GL(); } @@ -186,6 +190,14 @@ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, TRACE("(%p) : Creating surface (target %#x) level %d, d3d format %s, internal format %#x, width %d, height %d, gl format %#x, gl type=%#x\n", This, This->glDescription.target, This->glDescription.level, debug_d3dformat(This->resource.format), internal, width, height, format, type); + if (This->resource.format == WINED3DFMT_DXT1 || + This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || + This->resource.format == WINED3DFMT_DXT4 || This->resource.format == WINED3DFMT_DXT5) { + /* glCompressedTexImage2D does not accept NULL pointers, so we cannot allocate a compressed texture without uploading data */ + TRACE("Not allocating compressed surfaces, surface_upload_data will specify them\n"); + return; + } + ENTER_GL(); glTexImage2D(This->glDescription.target, This->glDescription.level, internal, width, height, 0, format, type, NULL);

1 0

Stefan Dösinger : wined3d: Check error conditions before creating the object.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 0ddd236480fa1cf9e3ef1c3b01bdc0f1d335f2b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0ddd236480fa1cf9e3ef1c3b0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:24:39 2007 +0100 wined3d: Check error conditions before creating the object. --- dlls/wined3d/device.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5804df8..2315a45 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -505,13 +505,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateVertexBuffer(IWineD3DDevice *ifac WINED3DFORMAT Format = WINED3DFMT_VERTEXDATA; /* Dummy format for now */ int dxVersion = ( (IWineD3DImpl *) This->wineD3D)->dxVersion; BOOL conv; + + if(Size == 0) { + WARN("Size 0 requested, returning WINED3DERR_INVALIDCALL\n"); + *ppVertexBuffer = NULL; + return WINED3DERR_INVALIDCALL; + } + D3DCREATERESOURCEOBJECTINSTANCE(object, VertexBuffer, WINED3DRTYPE_VERTEXBUFFER, Size) TRACE("(%p) : Size=%d, Usage=%d, FVF=%x, Pool=%d - Memory@%p, Iface@%p\n", This, Size, Usage, FVF, Pool, object->resource.allocatedMemory, object); *ppVertexBuffer = (IWineD3DVertexBuffer *)object; - if(Size == 0) return WINED3DERR_INVALIDCALL; - if (Pool == WINED3DPOOL_DEFAULT ) { /* Allocate some system memory for now */ object->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, object->resource.size); }

1 0

Stefan Dösinger : wined3d: Partial render target locking.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 403b5ecf60bc3bb1ed8b5fe526c574b6744dbae6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=403b5ecf60bc3bb1ed8b5fe52… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:24:00 2007 +0100 wined3d: Partial render target locking. --- dlls/wined3d/surface.c | 136 ++++++++++++++++++++++++------------------------ 1 files changed, 68 insertions(+), 68 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=403b5ecf60bc3bb1ed8b5…

1 0

Stefan Dösinger : wined3d: Always use np2 repacking if no native np2 support is available.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: b48dfb3c547f060270b96e51f6bebc9ce1d0a891 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b48dfb3c547f060270b96e51f… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:48 2007 +0100 wined3d: Always use np2 repacking if no native np2 support is available. --- dlls/d3d9/tests/surface.c | 6 +- dlls/wined3d/device.c | 44 ++++++--------------- dlls/wined3d/directx.c | 6 --- dlls/wined3d/state.c | 2 +- dlls/wined3d/surface.c | 82 +++++++++++++++++++--------------------- dlls/wined3d/wined3d_main.c | 18 --------- dlls/wined3d/wined3d_private.h | 2 - 7 files changed, 55 insertions(+), 105 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=b48dfb3c547f060270b96…

1 0

Stefan Dösinger : wined3d: Improve render target locking.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 21172f1dec0517934c3c9a6d43d9f9a856e7a4bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=21172f1dec0517934c3c9a6d4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:44 2007 +0100 wined3d: Improve render target locking. --- dlls/wined3d/surface.c | 525 ++++++++++++++++++----------------------------- 1 files changed, 201 insertions(+), 324 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=21172f1dec0517934c3c9…

1 0

Stefan Dösinger : wined3d: Remove pow2Size from the surfaces.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: c3f0eb489b95fef577dd4d0cb7af74eddddb678c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c3f0eb489b95fef577dd4d0cb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:41 2007 +0100 wined3d: Remove pow2Size from the surfaces. --- dlls/wined3d/device.c | 3 --- dlls/wined3d/surface.c | 13 ++----------- dlls/wined3d/surface_gdi.c | 1 - dlls/wined3d/wined3d_private.h | 25 +++++++++++-------------- 4 files changed, 13 insertions(+), 29 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5b188c6..51caef6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -832,11 +832,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_CreateSurface(IWineD3DDevice *iface, U if (WINED3DFMT_UNKNOWN != Format) { object->bytesPerPixel = tableEntry->bpp; - object->pow2Size = ((pow2Width * object->bytesPerPixel) + SURFACE_ALIGNMENT - 1) & ~(SURFACE_ALIGNMENT - 1); - object->pow2Size *= pow2Height; } else { object->bytesPerPixel = 0; - object->pow2Size = 0; } /** TODO: change this into a texture transform matrix so that it's processed in hardware **/ diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3cd5e1e..3d60b3f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -628,12 +628,10 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED /*Surface has no memory currently allocated to it!*/ TRACE("(%p) Locking rect\n" , This); if(!This->resource.allocatedMemory) { - This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->pow2Size); + This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 , This->resource.size + 4); } if (0 != This->glDescription.textureName) { /* Now I have to copy thing bits back */ - This->Flags |= SFLAG_ACTIVELOCK; /* When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory */ - /* TODO: make activeLock a bit more intelligent, maybe implement a method to purge the texture memory. */ /* Make sure that a proper texture unit is selected, bind the texture and dirtify the sampler to restore the texture on the next draw */ if (GL_SUPPORT(ARB_MULTITEXTURE)) { @@ -681,7 +679,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED if (This->resource.allocatedMemory == NULL) This->resource.allocatedMemory = HeapAlloc(GetProcessHeap() ,0 ,This->resource.size); - This->Flags |= SFLAG_ACTIVELOCK; /*When this flag is set to true, loading the surface again won't free THis->resource.allocatedMemory*/ pLockedRect->pBits = This->resource.allocatedMemory; glFlush(); @@ -1243,10 +1240,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_GetDC(IWineD3DSurface *iface, HDC *pHDC) { int extraline = 0; SYSTEM_INFO sysInfo; - if(This->Flags & SFLAG_ACTIVELOCK) { - ERR("Creating a DIB section while a lock is active. Uncertain consequences\n"); - } - switch (This->bytesPerPixel) { case 2: case 4: @@ -2092,17 +2085,15 @@ HRESULT WINAPI IWineD3DSurfaceImpl_SetFormat(IWineD3DSurface *iface, WINED3DFORM if (format != WINED3DFMT_UNKNOWN) { This->bytesPerPixel = formatEntry->bpp; - This->pow2Size = (This->pow2Width * This->bytesPerPixel) * This->pow2Height; } else { This->bytesPerPixel = 0; - This->pow2Size = 0; } This->Flags |= (WINED3DFMT_D16_LOCKABLE == format) ? SFLAG_LOCKABLE : 0; This->resource.format = format; - TRACE("(%p) : Size %d, pow2Size %d, bytesPerPixel %d, glFormat %d, glFotmatInternal %d, glType %d\n", This, This->resource.size, This->pow2Size, This->bytesPerPixel, This->glDescription.glFormat, This->glDescription.glFormatInternal, This->glDescription.glType); + TRACE("(%p) : Size %d, bytesPerPixel %d, glFormat %d, glFotmatInternal %d, glType %d\n", This, This->resource.size, This->bytesPerPixel, This->glDescription.glFormat, This->glDescription.glFormatInternal, This->glDescription.glType); return WINED3D_OK; } diff --git a/dlls/wined3d/surface_gdi.c b/dlls/wined3d/surface_gdi.c index 2920593..34d6bff 100644 --- a/dlls/wined3d/surface_gdi.c +++ b/dlls/wined3d/surface_gdi.c @@ -1522,7 +1522,6 @@ IWineGDISurfaceImpl_PrivateSetup(IWineD3DSurface *iface) /* We don't mind the nonpow2 stuff in GDI */ This->resource.size = IWineD3DSurface_GetPitch(iface) * This->currentDesc.Height; - This->pow2Size = This->resource.size; This->pow2Width = This->currentDesc.Width; This->pow2Height = This->currentDesc.Height; This->Flags &= ~SFLAG_NONPOW2; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index f654b38..9c5cf33 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1069,18 +1069,17 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *S #define SFLAG_LOCKABLE 0x00000010 /* Surface can be locked */ #define SFLAG_DISCARD 0x00000020 /* ??? */ #define SFLAG_LOCKED 0x00000040 /* Surface is locked atm */ -#define SFLAG_ACTIVELOCK 0x00000080 /* Not locked, but surface memory is needed */ -#define SFLAG_INTEXTURE 0x00000100 /* ??? */ -#define SFLAG_INPBUFFER 0x00000200 /* ??? */ -#define SFLAG_NONPOW2 0x00000400 /* Surface sizes are not a power of 2 */ -#define SFLAG_DYNLOCK 0x00000800 /* Surface is often locked by the app */ -#define SFLAG_DYNCHANGE 0x00001800 /* Surface contents are changed very often, implies DYNLOCK */ -#define SFLAG_DCINUSE 0x00002000 /* Set between GetDC and ReleaseDC calls */ -#define SFLAG_GLDIRTY 0x00004000 /* The opengl texture is more up to date than the surface mem */ -#define SFLAG_LOST 0x00008000 /* Surface lost flag for DDraw */ -#define SFLAG_FORCELOAD 0x00010000 /* To force PreLoading of a scratch cursor */ -#define SFLAG_USERPTR 0x00020000 /* The application allocated the memory for this surface */ -#define SFLAG_GLCKEY 0x00040000 /* The gl texture was created with a color key */ +#define SFLAG_INTEXTURE 0x00000080 /* ??? */ +#define SFLAG_INPBUFFER 0x00000100 /* ??? */ +#define SFLAG_NONPOW2 0x00000200 /* Surface sizes are not a power of 2 */ +#define SFLAG_DYNLOCK 0x00000400 /* Surface is often locked by the app */ +#define SFLAG_DYNCHANGE 0x00000C00 /* Surface contents are changed very often, implies DYNLOCK */ +#define SFLAG_DCINUSE 0x00001000 /* Set between GetDC and ReleaseDC calls */ +#define SFLAG_GLDIRTY 0x00002000 /* The opengl texture is more up to date than the surface mem */ +#define SFLAG_LOST 0x00004000 /* Surface lost flag for DDraw */ +#define SFLAG_FORCELOAD 0x00008000 /* To force PreLoading of a scratch cursor */ +#define SFLAG_USERPTR 0x00010000 /* The application allocated the memory for this surface */ +#define SFLAG_GLCKEY 0x00020000 /* The gl texture was created with a color key */ /* In some conditions the surface memory must not be freed: * SFLAG_OVERSIZE: Not all data can be kept in GL @@ -1088,7 +1087,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *S * SFLAG_DIBSECTION: The dib code manages the memory * SFLAG_DIRTY: GL surface isn't up to date * SFLAG_LOCKED: The app requires access to the surface data - * SFLAG_ACTIVELOCK: Some wined3d code needs the memory * SFLAG_DYNLOCK: Avoid freeing the data for performance * SFLAG_DYNCHANGE: Same reason as DYNLOCK */ @@ -1097,7 +1095,6 @@ HRESULT WINAPI IWineD3DSurfaceImpl_UpdateOverlay(IWineD3DSurface *iface, RECT *S SFLAG_DIBSECTION | \ SFLAG_DIRTY | \ SFLAG_LOCKED | \ - SFLAG_ACTIVELOCK | \ SFLAG_DYNLOCK | \ SFLAG_DYNCHANGE | \ SFLAG_USERPTR)

1 0

Stefan Dösinger : wined3d: Show fullscreen rendering windows.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: e16d08f011a9bff4191e0f2657f12b6ab7fd7ba8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e16d08f011a9bff4191e0f265… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:36 2007 +0100 wined3d: Show fullscreen rendering windows. --- dlls/wined3d/device.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index d3b8315..5b188c6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1301,6 +1301,7 @@ static void WINAPI IWineD3DDeviceImpl_SetupFullscreenWindow(IWineD3DDevice *ifac /* Inform the window about the update. */ SetWindowPos(window, HWND_TOP, 0, 0, This->ddraw_width, This->ddraw_height, SWP_FRAMECHANGED); + ShowWindow(window, TRUE); } /*****************************************************************************

1 0

Stefan Dösinger : wined3d: GetRenderTargetData can call BltFast.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: f196680c59f77db91eac1b8829a041d36b09a342 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f196680c59f77db91eac1b882… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:14:41 2007 +0100 wined3d: GetRenderTargetData can call BltFast. --- dlls/d3d9/device.c | 4 +- dlls/wined3d/device.c | 78 -------------------------------------- include/wine/wined3d_interface.h | 2 - 3 files changed, 2 insertions(+), 82 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 4c27853..4eff550 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -344,8 +344,8 @@ static HRESULT WINAPI IDirect3DDevice9Impl_GetRenderTargetData(LPDIRECT3DDEVIC IDirect3DDevice9Impl *This = (IDirect3DDevice9Impl *)iface; IDirect3DSurface9Impl *renderTarget = (IDirect3DSurface9Impl *)pRenderTarget; IDirect3DSurface9Impl *destSurface = (IDirect3DSurface9Impl *)pDestSurface; - TRACE("(%p) Relay\n" , This); - return IWineD3DDevice_GetRenderTargetData(This->WineD3DDevice, renderTarget->wineD3DSurface, destSurface->wineD3DSurface); + TRACE("(%p)->(%p,%p)\n" , This, renderTarget, destSurface); + return IWineD3DSurface_BltFast(destSurface->wineD3DSurface, 0, 0, renderTarget->wineD3DSurface, NULL, DDBLTFAST_NOCOLORKEY); } static HRESULT WINAPI IDirect3DDevice9Impl_GetFrontBufferData(LPDIRECT3DDEVICE9 iface, UINT iSwapChain, IDirect3DSurface9* pDestSurface) { diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f84f514..d3b8315 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4829,83 +4829,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateTexture (IWineD3DDevice *iface, I return hr; } -static HRESULT WINAPI IWineD3DDeviceImpl_GetRenderTargetData(IWineD3DDevice *iface, IWineD3DSurface *pRenderTarget, IWineD3DSurface *pSurface) { - IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - /** TODO: remove remove casts to IWineD3DSurfaceImpl * - * NOTE It may be best to move the code into surface to occomplish this - ****************************************/ - - WINED3DSURFACE_DESC surfaceDesc; - unsigned int surfaceWidth, surfaceHeight; - glDescriptor *targetGlDescription = NULL; - glDescriptor *surfaceGlDescription = NULL; - IWineD3DSwapChainImpl *container = NULL; - - IWineD3DSurface_GetGlDesc(pRenderTarget, &targetGlDescription); - IWineD3DSurface_GetGlDesc(pSurface, &surfaceGlDescription); - memset(&surfaceDesc, 0, sizeof(surfaceDesc)); - - surfaceDesc.Width = &surfaceWidth; - surfaceDesc.Height = &surfaceHeight; - IWineD3DSurface_GetDesc(pSurface, &surfaceDesc); - /* check to see if it's the backbuffer or the frontbuffer being requested (to make sure the data is up to date)*/ - - /* Ok, I may need to setup some kind of active swapchain reference on the device */ - IWineD3DSurface_GetContainer(pRenderTarget, &IID_IWineD3DSwapChain, (void **)&container); - ENTER_GL(); - /* TODO: opengl Context switching for swapchains etc... */ - if (NULL != container || pRenderTarget == This->render_targets[0] || pRenderTarget == This->depthStencilBuffer) { - if (NULL != container && (pRenderTarget == container->backBuffer[0])) { - glReadBuffer(GL_BACK); - vcheckGLcall("glReadBuffer(GL_BACK)"); - } else if ((NULL != container && (pRenderTarget == container->frontBuffer)) || (pRenderTarget == This->render_targets[0])) { - glReadBuffer(GL_FRONT); - vcheckGLcall("glReadBuffer(GL_FRONT)"); - } else if (pRenderTarget == This->depthStencilBuffer) { - FIXME("Reading of depthstencil not yet supported\n"); - } - - glReadPixels(0, - 0, - surfaceWidth, - surfaceHeight, - surfaceGlDescription->glFormat, - surfaceGlDescription->glType, - (void *)IWineD3DSurface_GetData(pSurface)); - vcheckGLcall("glReadPixels(...)"); - if(NULL != container ){ - IWineD3DSwapChain_Release((IWineD3DSwapChain*) container); - } - } else { - IWineD3DBaseTexture *container; - GLenum textureDimensions = GL_TEXTURE_2D; - - if (WINED3D_OK == IWineD3DSurface_GetContainer(pSurface, &IID_IWineD3DBaseTexture, (void **)&container)) { - textureDimensions = IWineD3DBaseTexture_GetTextureDimensions(container); - IWineD3DBaseTexture_Release(container); - } - /* TODO: 2D -> Cube surface coppies etc.. */ - if (surfaceGlDescription->target != textureDimensions) { - FIXME("(%p) : Texture dimension mismatch\n", This); - } - glEnable(textureDimensions); - vcheckGLcall("glEnable(GL_TEXTURE_...)"); - /* FIXME: this isn't correct, it need to add a dirty rect if nothing else... */ - glBindTexture(targetGlDescription->target, targetGlDescription->textureName); - vcheckGLcall("glBindTexture"); - glGetTexImage(surfaceGlDescription->target, - surfaceGlDescription->level, - surfaceGlDescription->glFormat, - surfaceGlDescription->glType, - (void *)IWineD3DSurface_GetData(pSurface)); - glDisable(textureDimensions); - vcheckGLcall("glDisable(GL_TEXTURE_...)"); - - } - LEAVE_GL(); - return WINED3D_OK; -} - static HRESULT WINAPI IWineD3DDeviceImpl_GetFrontBufferData(IWineD3DDevice *iface,UINT iSwapChain, IWineD3DSurface *pDestSurface) { IWineD3DSwapChain *swapChain; HRESULT hr; @@ -6205,7 +6128,6 @@ const IWineD3DDeviceVtbl IWineD3DDevice_Vtbl = IWineD3DDeviceImpl_ColorFill, IWineD3DDeviceImpl_UpdateTexture, IWineD3DDeviceImpl_UpdateSurface, - IWineD3DDeviceImpl_GetRenderTargetData, IWineD3DDeviceImpl_GetFrontBufferData, IWineD3DDeviceImpl_SetupFullscreenWindow, IWineD3DDeviceImpl_RestoreWindow, diff --git a/include/wine/wined3d_interface.h b/include/wine/wined3d_interface.h index 305616b..b6bf26e 100644 --- a/include/wine/wined3d_interface.h +++ b/include/wine/wined3d_interface.h @@ -469,7 +469,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) STDMETHOD(ColorFill)(THIS_ struct IWineD3DSurface* pSurface, CONST WINED3DRECT* pRect, WINED3DCOLOR color) PURE; STDMETHOD(UpdateTexture)(THIS_ struct IWineD3DBaseTexture *pSourceTexture, struct IWineD3DBaseTexture *pDestinationTexture) PURE; STDMETHOD(UpdateSurface)(THIS_ struct IWineD3DSurface* pSourceSurface, CONST RECT* pSourceRect, struct IWineD3DSurface* pDestinationSurface, CONST POINT* pDestPoint) PURE; - STDMETHOD(GetRenderTargetData)(THIS_ struct IWineD3DSurface* pRenderTarget, struct IWineD3DSurface* pSurface) PURE; STDMETHOD(GetFrontBufferData)(THIS_ UINT iSwapChain,struct IWineD3DSurface* pSurface) PURE; STDMETHOD_(void, SetupFullscreenWindow)(THIS_ HWND window) PURE; STDMETHOD_(void, RestoreWindow)(THIS_ HWND window) PURE; @@ -609,7 +608,6 @@ DECLARE_INTERFACE_(IWineD3DDevice,IWineD3DBase) #define IWineD3DDevice_ColorFill(p,a,b,c) (p)->lpVtbl->ColorFill(p,a,b,c) #define IWineD3DDevice_UpdateTexture(p,a,b) (p)->lpVtbl->UpdateTexture(p,a,b) #define IWineD3DDevice_UpdateSurface(p,a,b,c,d) (p)->lpVtbl->UpdateSurface(p,a,b,c,d) -#define IWineD3DDevice_GetRenderTargetData(p,a,b) (p)->lpVtbl->GetRenderTargetData(p,a,b) #define IWineD3DDevice_GetFrontBufferData(p,a,b) (p)->lpVtbl->GetFrontBufferData(p,a,b) #define IWineD3DDevice_SetupFullscreenWindow(p, a) (p)->lpVtbl->SetupFullscreenWindow(p,a); #define IWineD3DDevice_RestoreWindow(p, a) (p)->lpVtbl->RestoreWindow(p,a);

1 0

Stefan Dösinger : wined3d: Dirtify the render targets, not the primary swapchain on draws.
by Alexandre Julliard Feb. 14, 2007

Feb. 14, 2007

Module: wine Branch: master Commit: 8cae0e4d07ea4f533ddaed50af03458bc0179e16 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8cae0e4d07ea4f533ddaed50a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 13 20:21:32 2007 +0100 wined3d: Dirtify the render targets, not the primary swapchain on draws. --- dlls/wined3d/drawprim.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index dcf6d26..63c89ef 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1177,18 +1177,15 @@ void drawPrimitive(IWineD3DDevice *iface, int minIndex) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; - IWineD3DSwapChainImpl *swapchain; int i; /* Signals other modules that a drawing is in progress and the stateblock finalized */ This->isInDraw = TRUE; /* Invalidate the back buffer memory so LockRect will read it the next time */ - for(i = 0; i < IWineD3DDevice_GetNumberOfSwapChains(iface); i++) { - IWineD3DDevice_GetSwapChain(iface, i, (IWineD3DSwapChain **) &swapchain); - if(swapchain) { - if(swapchain->backBuffer) ((IWineD3DSurfaceImpl *) swapchain->backBuffer[0])->Flags |= SFLAG_GLDIRTY; - IWineD3DSwapChain_Release( (IWineD3DSwapChain *) swapchain); + for(i = 0; i < GL_LIMITS(buffers); i++) { + if(This->render_targets[i]) { + ((IWineD3DSurfaceImpl *) This->render_targets[i])->Flags |= SFLAG_GLDIRTY; } }

1 0