January 2008 - Wine-Commits

H. Verbeet : wined3d: SFLAG_INTEXTURE is the same as SFLAG_INDRAWABLE for offscreen render targets when ORM_FBO is used .
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: bf50e07f342a5d26ed1ceb600e9a9a989d58ba97 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf50e07f342a5d26ed1ceb600… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:53:13 2008 +0100 wined3d: SFLAG_INTEXTURE is the same as SFLAG_INDRAWABLE for offscreen render targets when ORM_FBO is used. --- dlls/wined3d/surface.c | 34 ++++++++++++++++++++++++++++++++-- 1 files changed, 32 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 98ab6b9..ceeb185 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3534,7 +3534,19 @@ static void WINAPI IWineD3DSurfaceImpl_ModifyLocation(IWineD3DSurface *iface, DW flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", persistent ? "TRUE" : "FALSE"); - /* TODO: For offscreen textures with fbo offscreen rendering the drawable is the same as the texture.*/ + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + IWineD3DSwapChain *swapchain = NULL; + + if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + TRACE("Surface %p is an onscreen surface\n", iface); + + IWineD3DSwapChain_Release(swapchain); + } else { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ + if (flag & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE)) flag |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); + } + } + if(persistent) { if((This->Flags & SFLAG_INTEXTURE) && !(flag & SFLAG_INTEXTURE)) { if (IWineD3DSurface_GetContainer(iface, &IID_IWineD3DBaseTexture, (void **)&texture) == WINED3D_OK) { @@ -3762,12 +3774,25 @@ static inline void surface_blt_to_drawable(IWineD3DSurfaceImpl *This, const RECT static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, DWORD flag, const RECT *rect) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + IWineD3DSwapChain *swapchain = NULL; GLenum format, internal, type; CONVERT_TYPES convert; int bpp; int width, pitch, outpitch; BYTE *mem; + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + if (SUCCEEDED(IWineD3DSurface_GetContainer(iface, &IID_IWineD3DSwapChain, (void **)&swapchain))) { + TRACE("Surface %p is an onscreen surface\n", iface); + + IWineD3DSwapChain_Release(swapchain); + } else { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. + * Prefer SFLAG_INTEXTURE. */ + if (flag == SFLAG_INDRAWABLE) flag = SFLAG_INTEXTURE; + } + } + TRACE("(%p)->(%s, %p)\n", iface, flag == SFLAG_INSYSMEM ? "SFLAG_INSYSMEM" : flag == SFLAG_INDRAWABLE ? "SFLAG_INDRAWABLE" : "SFLAG_INTEXTURE", rect); @@ -3775,7 +3800,6 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D TRACE("Rectangle: (%d,%d)-(%d,%d)\n", rect->left, rect->top, rect->right, rect->bottom); } - /* TODO: For fbo targets, texture == drawable */ if(This->Flags & flag) { TRACE("Location already up to date\n"); return WINED3D_OK; @@ -3921,6 +3945,12 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D This->Flags |= flag; } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && !swapchain + && (This->Flags & (SFLAG_INTEXTURE | SFLAG_INDRAWABLE))) { + /* With ORM_FBO, SFLAG_INTEXTURE and SFLAG_INDRAWABLE are the same for offscreen targets. */ + This->Flags |= (SFLAG_INTEXTURE | SFLAG_INDRAWABLE); + } + return WINED3D_OK; }

1 0

H. Verbeet : wined3d: Properly handle the surface location in stretch_rect_fbo().
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 3f6c3d2db0b77f44e711d1ee2e2416e2708ef3d1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3f6c3d2db0b77f44e711d1ee2… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:53:24 2008 +0100 wined3d: Properly handle the surface location in stretch_rect_fbo(). --- dlls/wined3d/device.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 30f7b61..9d17498 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6318,6 +6318,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED TRACE("Source surface %p is onscreen\n", src_surface); ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); + /* Make sure the drawable is up to date. In the offscreen case + * attach_surface_fbo() implicitly takes care of this. */ + IWineD3DSurface_LoadLocation(src_surface, SFLAG_INDRAWABLE, NULL); ENTER_GL(); GL_EXTCALL(glBindFramebufferEXT(GL_READ_FRAMEBUFFER_EXT, 0)); @@ -6344,6 +6347,9 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED TRACE("Destination surface %p is onscreen\n", dst_surface); ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); + /* Make sure the drawable is up to date. In the offscreen case + * attach_surface_fbo() implicitly takes care of this. */ + IWineD3DSurface_LoadLocation(dst_surface, SFLAG_INDRAWABLE, NULL); ENTER_GL(); GL_EXTCALL(glBindFramebufferEXT(GL_DRAW_FRAMEBUFFER_EXT, 0)); @@ -6380,6 +6386,8 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED checkGLcall("glBlitFramebuffer()"); } + IWineD3DSurface_ModifyLocation(dst_surface, SFLAG_INDRAWABLE, TRUE); + if (This->render_offscreen) { bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); } else {

1 0

H. Verbeet : wined3d: Bind the surface texture in LoadLocation().
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 4863daf06a1e24e8b8f5de8f96b153d988e6964a URL: http://source.winehq.org/git/wine.git/?a=commit;h=4863daf06a1e24e8b8f5de8f9… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:52:56 2008 +0100 wined3d: Bind the surface texture in LoadLocation(). --- dlls/wined3d/surface.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 734568a..98ab6b9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -47,16 +47,14 @@ static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { IWineD3DSurface_BindTexture((IWineD3DSurface *)This); } +/* This call just downloads data, the caller is responsible for activating the + * right context and binding the correct texture. */ static void surface_download_data(IWineD3DSurfaceImpl *This) { - IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; - if (0 == This->glDescription.textureName) { ERR("Surface does not have a texture, but SFLAG_INTEXTURE is set\n"); return; } - ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - if(This->Flags & SFLAG_CONVERTED) { FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); return; @@ -64,8 +62,6 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { ENTER_GL(); - surface_bind_and_dirtify(This); - 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) { @@ -194,6 +190,8 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { This->Flags |= SFLAG_INSYSMEM; } +/* This call just uploads data, the caller is responsible for activating the + * right context and binding the correct texture. */ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *data) { if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 || @@ -250,6 +248,8 @@ static void surface_upload_data(IWineD3DSurfaceImpl *This, GLenum internal, GLsi } } +/* This call just allocates the texture, the caller is responsible for + * activating the right context and binding the correct texture. */ static void surface_allocate_surface(IWineD3DSurfaceImpl *This, GLenum internal, GLsizei width, GLsizei height, GLenum format, GLenum type) { BOOL enable_client_storage = FALSE; BYTE *mem = NULL; @@ -3792,6 +3792,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D /* Download the surface to system memory */ if(This->Flags & SFLAG_INTEXTURE) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + surface_bind_and_dirtify(This); + surface_download_data(This); } else { read_from_framebuffer(This, rect, @@ -3807,6 +3810,9 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } else /* if(flag == SFLAG_INTEXTURE) */ { d3dfmt_get_conv(This, TRUE /* We need color keying */, TRUE /* We will use textures */, &format, &internal, &type, &convert, &bpp, This->srgb); + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + surface_bind_and_dirtify(This); + if (This->Flags & SFLAG_INDRAWABLE) { GLint prevRead;

1 0

H. Verbeet : wined3d: Call ActivateContext regardless of WINED3DCREATE_MULTITHREADED.
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: c46c53a12c1cacb11435442156831ff4d48f9b9c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c46c53a12c1cacb1143544215… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:51:51 2008 +0100 wined3d: Call ActivateContext regardless of WINED3DCREATE_MULTITHREADED. --- dlls/wined3d/device.c | 12 +++--------- dlls/wined3d/indexbuffer.c | 4 +--- dlls/wined3d/surface.c | 5 ++--- 3 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 9ebce5e..30f7b61 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4246,12 +4246,8 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ProcessVertices(IWineD3DDevice *iface, ERR("Output vertex declaration not implemented yet\n"); } - /* Need any context to write to the vbo. In a non-multithreaded environment a context is there anyway, - * and this call is quite performance critical, so don't call needlessly - */ - if(This->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + /* Need any context to write to the vbo. */ + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); /* ProcessVertices reads from vertex buffers, which have to be assigned. DrawPrimitive and DrawPrimitiveUP * control the streamIsUP flag, thus restore it afterwards. @@ -4741,9 +4737,7 @@ static HRESULT WINAPI IWineD3DDeviceImpl_EndScene(IWineD3DDevice *iface) { return WINED3DERR_INVALIDCALL; } - if(This->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); /* We only have to do this if we need to read the, swapbuffers performs a flush for us */ ENTER_GL(); glFlush(); diff --git a/dlls/wined3d/indexbuffer.c b/dlls/wined3d/indexbuffer.c index 62d90d1..bcfb0e6 100644 --- a/dlls/wined3d/indexbuffer.c +++ b/dlls/wined3d/indexbuffer.c @@ -158,9 +158,7 @@ static HRESULT WINAPI IWineD3DIndexBufferImpl_Unlock(IWineD3DIndexBuffer *iface) if(locks == 0 && This->vbo && (This->dirtyend - This->dirtystart) > 0) { IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - if(device->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); GL_EXTCALL(glBindBufferARB(GL_ELEMENT_ARRAY_BUFFER_ARB, This->vbo)); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 489f72e..29bc21c 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -44,9 +44,8 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { return; } - if(myDevice->createParms.BehaviorFlags & WINED3DCREATE_MULTITHREADED) { - ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } + ActivateContext(myDevice, myDevice->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if(This->Flags & SFLAG_CONVERTED) { FIXME("Read back converted textures unsupported, format=%s\n", debug_d3dformat(This->resource.format)); return;

1 0

H. Verbeet : wined3d: Call SetGlTextureDesc() from BindTexture() rather than from PreLoad().
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 2820ecc5fe34b7746979e0b3d8719f83672c311a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2820ecc5fe34b7746979e0b3d… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:52:05 2008 +0100 wined3d: Call SetGlTextureDesc() from BindTexture() rather than from PreLoad(). --- dlls/wined3d/cubetexture.c | 21 +++++++++++++++------ dlls/wined3d/texture.c | 19 +++++++++++++------ 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index e99ab38..5d16733 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -102,7 +102,6 @@ static DWORD WINAPI IWineD3DCubeTextureImpl_GetPriority(IWineD3DCubeTexture *ifa static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { /* Override the IWineD3DResource Preload method */ unsigned int i,j; - BOOL setGlTextureDesc = FALSE; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; BOOL srgb_mode = This->baseTexture.is_srgb; @@ -110,8 +109,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { TRACE("(%p) : About to load texture: dirtified(%d)\n", This, This->baseTexture.dirty); - if (This->baseTexture.textureName == 0) setGlTextureDesc = TRUE; - /* We only have to activate a context for gl when we're not drawing. In most cases PreLoad will be called during draw * and a context was activated at the beginning of drawPrimitive */ @@ -132,8 +129,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z ; j++) { - if(setGlTextureDesc) - IWineD3DSurface_SetGlTextureDesc(This->surfaces[j][i], This->baseTexture.textureName, cube_targets[j]); IWineD3DSurface_LoadTexture(This->surfaces[j][i], srgb_mode); } } @@ -210,8 +205,22 @@ static BOOL WINAPI IWineD3DCubeTextureImpl_GetDirty(IWineD3DCubeTexture *iface) static HRESULT WINAPI IWineD3DCubeTextureImpl_BindTexture(IWineD3DCubeTexture *iface) { IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; + BOOL set_gl_texture_desc = This->baseTexture.textureName == 0; + HRESULT hr; + TRACE("(%p) : relay to BaseTexture\n", This); - return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); + + hr = IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); + if (set_gl_texture_desc && SUCCEEDED(hr)) { + UINT i, j; + for (i = 0; i < This->baseTexture.levels; ++i) { + for (j = WINED3DCUBEMAP_FACE_POSITIVE_X; j <= WINED3DCUBEMAP_FACE_NEGATIVE_Z; ++j) { + IWineD3DSurface_SetGlTextureDesc(This->surfaces[j][i], This->baseTexture.textureName, cube_targets[j]); + } + } + } + + return hr; } static HRESULT WINAPI IWineD3DCubeTextureImpl_UnBindTexture(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index c96d35d..3c3fc89 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -95,7 +95,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { /* Override the IWineD3DResource PreLoad method */ unsigned int i; - BOOL setGlTextureDesc = FALSE; IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; BOOL srgb_mode = This->baseTexture.is_srgb; @@ -103,8 +102,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { TRACE("(%p) : About to load texture\n", This); - if (This->baseTexture.textureName == 0) setGlTextureDesc = TRUE; - if(!device->isInDraw) { /* ActivateContext sets isInDraw to TRUE when loading a pbuffer into a texture, thus no danger of * recursive calls @@ -121,8 +118,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { /* If the texture is marked dirty or the srgb sampler setting has changed since the last load then reload the surfaces */ if (This->baseTexture.dirty) { for (i = 0; i < This->baseTexture.levels; i++) { - if(setGlTextureDesc) - IWineD3DSurface_SetGlTextureDesc(This->surfaces[i], This->baseTexture.textureName, IWineD3DTexture_GetTextureDimensions(iface)); IWineD3DSurface_LoadTexture(This->surfaces[i], srgb_mode); } } else if (srgb_was_toggled) { @@ -193,8 +188,20 @@ static BOOL WINAPI IWineD3DTextureImpl_GetDirty(IWineD3DTexture *iface) { static HRESULT WINAPI IWineD3DTextureImpl_BindTexture(IWineD3DTexture *iface) { IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + BOOL set_gl_texture_desc = This->baseTexture.textureName == 0; + HRESULT hr; + TRACE("(%p) : relay to BaseTexture\n", This); - return IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); + + hr = IWineD3DBaseTextureImpl_BindTexture((IWineD3DBaseTexture *)iface); + if (set_gl_texture_desc && SUCCEEDED(hr)) { + UINT i; + for (i = 0; i < This->baseTexture.levels; ++i) { + IWineD3DSurface_SetGlTextureDesc(This->surfaces[i], This->baseTexture.textureName, IWineD3DTexture_GetTextureDimensions(iface)); + } + } + + return hr; } static HRESULT WINAPI IWineD3DTextureImpl_UnBindTexture(IWineD3DTexture *iface) {

1 0

Alexandre Julliard : server: Redesign the server shutdown processing.
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: af268c621131624fc34f34ccab9fcd8d47500c31 URL: http://source.winehq.org/git/wine.git/?a=commit;h=af268c621131624fc34f34cca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 16:16:00 2008 +0100 server: Redesign the server shutdown processing. System processes are now killed only after the server persistence delay has expired. New processes are not allowed to start during shutdown. --- server/process.c | 66 +++++++++++++++++++++++++++++++++++++++++++---------- server/process.h | 1 - server/request.c | 46 +++++++++++-------------------------- server/request.h | 2 +- server/signal.c | 2 - server/trace.c | 1 + 6 files changed, 69 insertions(+), 49 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=af268c621131624fc34f3…

1 0

H. Verbeet : wined3d: Move binding the texture and dirtifying the sampler to its own function from surface_download_data ().
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 6cab4c80053a4e103dff6110b1ecf2a6dc8af4bf URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cab4c80053a4e103dff6110b… Author: H. Verbeet <hverbeet(a)gmail.com> Date: Wed Jan 2 19:52:22 2008 +0100 wined3d: Move binding the texture and dirtifying the sampler to its own function from surface_download_data(). --- dlls/wined3d/surface.c | 22 +++++++++++++--------- 1 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 29bc21c..734568a 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -36,6 +36,17 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d_surface); HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UINT height, UINT outpitch, CONVERT_TYPES convert, IWineD3DSurfaceImpl *surf); static void d3dfmt_p8_init_palette(IWineD3DSurfaceImpl *This, BYTE table[256][4], BOOL colorkey); +static void surface_bind_and_dirtify(IWineD3DSurfaceImpl *This) { + /* 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)) { + GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); + checkGLcall("glActiveTextureARB"); + } + IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); + IWineD3DSurface_BindTexture((IWineD3DSurface *)This); +} + static void surface_download_data(IWineD3DSurfaceImpl *This) { IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; @@ -52,15 +63,8 @@ static void surface_download_data(IWineD3DSurfaceImpl *This) { } ENTER_GL(); - /* 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)) { - GL_EXTCALL(glActiveTextureARB(GL_TEXTURE0_ARB)); - checkGLcall("glActiveTextureARB"); - } - IWineD3DDeviceImpl_MarkStateDirty(This->resource.wineD3DDevice, STATE_SAMPLER(0)); - IWineD3DSurface_BindTexture((IWineD3DSurface *) This); + + surface_bind_and_dirtify(This); if (This->resource.format == WINED3DFMT_DXT1 || This->resource.format == WINED3DFMT_DXT2 || This->resource.format == WINED3DFMT_DXT3 ||

1 0

Alexandre Julliard : server: Use exponential backoff when waiting for wineserver -k to complete.
by Alexandre Julliard Jan. 3, 2008

Jan. 3, 2008

Module: wine Branch: master Commit: 307cb09a62072ccf2b24df9a1be8a5f3b5e44e47 URL: http://source.winehq.org/git/wine.git/?a=commit;h=307cb09a62072ccf2b24df9a1… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jan 2 16:13:08 2008 +0100 server: Use exponential backoff when waiting for wineserver -k to complete. --- server/request.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/server/request.c b/server/request.c index 8a2d4fc..759549a 100644 --- a/server/request.c +++ b/server/request.c @@ -623,7 +623,7 @@ int kill_lock_owner( int sig ) create_server_dir( server_dir ); fd = create_server_lock(); - for (i = 0; i < 10; i++) + for (i = 1; i <= 20; i++) { fl.l_type = F_WRLCK; fl.l_whence = SEEK_SET; @@ -647,7 +647,7 @@ int kill_lock_owner( int sig ) } } else if (fl.l_pid != pid) goto done; /* no longer the same process */ - sleep( 1 ); + usleep( 50000 * i ); } /* waited long enough, now kill it */ kill( pid, SIGKILL );

1 0

Alexander Nicolaysen Sørnes : objectManager: Get rid of setIsQueue/Rejected
by Chris Morgan Jan. 3, 2008

Jan. 3, 2008

Module: appdb Branch: master Commit: 61d2291e3beb2e39d345b516af7f0f5b6be4489e URL: http://source.winehq.org/git/appdb.git/?a=commit;h=61d2291e3beb2e39d345b516… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 2 00:28:32 2008 +0100 objectManager: Get rid of setIsQueue/Rejected --- include/objectManager.php | 22 ++++++---------------- include/util.php | 9 +++++++++ objectManager.php | 19 +++++-------------- 3 files changed, 20 insertions(+), 30 deletions(-) diff --git a/include/objectManager.php b/include/objectManager.php index 30c7b62..2dbfdf2 100644 --- a/include/objectManager.php +++ b/include/objectManager.php @@ -60,14 +60,14 @@ class ObjectManager return $this->sClass; } - public function setIsQueue($bIsQueue) + public function getState() { - $this->bIsQueue = $bIsQueue; + return $this->sState; + } - if($this->sState != 'rejected' && $bIsQueue) - $this->sState = 'queued'; - else if ($this->sState == 'queued' && !$bIsQueue) - $this->sState = 'accepted'; + public function setState($sState) + { + $this->sState = $sState; } public function getIsQueue() @@ -85,16 +85,6 @@ class ObjectManager $this->sReturnToTitle = $sTitle; } - public function setIsRejected($bIsRejected) - { - $this->bIsRejected = $bIsRejected; - - if($bIsRejected) - $this->sState = 'rejected'; - else if ($this->sState == 'rejected') - $this->sState = 'queued'; - } - public function setSortInfo($aClean = null) { /* No use to continue if there are no sortable fields */ diff --git a/include/util.php b/include/util.php index 0048da7..0822b3c 100644 --- a/include/util.php +++ b/include/util.php @@ -234,6 +234,15 @@ function make_maintainer_rating_list($varname, $cvalue) return $sTxt; } +/* Get the element with specified key from an array if it is defined */ +function getInput($sVar, $aInput) +{ + if(array_key_exists($sVar, $aInput)) + return $aInput[$sVar]; + + return null; +} + /* Get the number of users in the database */ function getNumberOfComments() { diff --git a/objectManager.php b/objectManager.php index 11f1e23..8be8181 100644 --- a/objectManager.php +++ b/objectManager.php @@ -42,10 +42,12 @@ $aClean['iId'] = isset($aClean['iId']) ? $aClean['iId'] : 0; $oObject = new objectManager($aClean['sClass'], $aClean['sTitle'], $aClean['iId']); -if(isset($aClean['bIsQueue']) && $aClean['bIsQueue'] == 'true') - $oObject->setIsQueue(true); +if(getInput('bIsRejected', $aClean) == 'true') + $oObject->setState('rejected'); +else if(getInput('bIsQueue', $aClean) == 'true') + $oObject->setState('queued'); else - $oObject->setIsQueue(false); + $oObject->setState('accepted'); if(isset($aClean['sReturnToTitle'])) $oObject->setReturnToTitle($aClean['sReturnToTitle']); @@ -53,17 +55,6 @@ if(isset($aClean['sReturnToTitle'])) if(isset($aClean['sReturnTo'])) $oObject->setReturnTo($aClean['sReturnTo']); -$aClean['bIsRejected'] = isset($aClean['bIsRejected']) ? $aClean['bIsRejected'] : false; -/* If it is rejected it is defined as queued */ -if($aClean['bIsRejected'] == 'true') -{ - $oObject->setIsRejected(true); - $oObject->setIsQueue(true); -} else -{ - $oObject->setIsRejected(false); -} - $oObject->getMultiPageDataFromInput($aClean); $oObject->setSortInfo($aClean);

1 0

Alexander Nicolaysen Sørnes : Fix typo in screenshot queue link
by Chris Morgan Jan. 3, 2008

Jan. 3, 2008

Module: appdb Branch: master Commit: b52fb8e0e4289d1dbed1e1fa774967e9ba90ae44 URL: http://source.winehq.org/git/appdb.git/?a=commit;h=b52fb8e0e4289d1dbed1e1fa… Author: Alexander Nicolaysen Sørnes <alex(a)thehandofagony.com> Date: Wed Jan 2 19:52:40 2008 +0100 Fix typo in screenshot queue link --- include/maintainer.php | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/include/maintainer.php b/include/maintainer.php index 0633c00..f81a338 100644 --- a/include/maintainer.php +++ b/include/maintainer.php @@ -1200,7 +1200,7 @@ class maintainer // FIXME: should use a function to generate these urls and use it here and // in sidebar_maintainer.php and sidebar_admin.php $sMsg.= 'Please visit the screenshot queue('; - $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot_queue&bIsQueue=true&sTitle=Screenshot%20Queue) '; + $sMsg.= APPDB_ROOT.'objectManager.php?sClass=screenshot&bIsQueue=true&sTitle=Screenshot%20Queue) '; $sMsg.= 'to process queued screenshots for versions you maintain.'."\n"; }

1 0