April 2008 - Wine-commits - list.winehq.org

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DOcclusionQueryImpl_Issue.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: b949190dcd4d1a16b34863e0e62ed421428c4d3b URL: http://source.winehq.org/git/wine.git/?a=commit;h=b949190dcd4d1a16b34863e0e… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:19 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DOcclusionQueryImpl_Issue. --- dlls/wined3d/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 96651bc..45e35b7 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -462,6 +462,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D if(ctx != This->wineD3DDevice->activeContext || ctx->tid != GetCurrentThreadId()) { WARN("Not the owning context, can't start query\n"); } else { + ENTER_GL(); /* This is allowed according to msdn and our tests. Reset the query and restart */ if (dwIssueFlags & WINED3DISSUE_BEGIN) { if(This->state == QUERY_BUILDING) { @@ -482,6 +483,7 @@ static HRESULT WINAPI IWineD3DOcclusionQueryImpl_Issue(IWineD3DQuery* iface, D checkGLcall("glEndQuery()"); } } + LEAVE_GL(); } } else { FIXME("(%p) : Occlusion queries not supported\n", This);

1 0

Alexander Dorofeyev : wined3d: move ENTER_GL in IWineD3DDeviceImpl_Init3D.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 71ca80355dcd36050a3bc6299653e3eaa9fefe8c URL: http://source.winehq.org/git/wine.git/?a=commit;h=71ca80355dcd36050a3bc6299… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:22 2008 +0300 wined3d: move ENTER_GL in IWineD3DDeviceImpl_Init3D. --- dlls/wined3d/device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b022c4e..cd07bf2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2121,11 +2121,13 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Init3D(IWineD3DDevice *iface, WINED3DPR } /* Set up some starting GL setup */ - ENTER_GL(); /* Setup all the devices defaults */ IWineD3DStateBlock_InitStartupStateBlock((IWineD3DStateBlock *)This->stateBlock); create_dummy_textures(This); + + ENTER_GL(); + #if 0 IWineD3DImpl_CheckGraphicsMemory(); #endif

1 0

Alexander Dorofeyev : wined3d: Add device->isInDraw checks in LoadLocation.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7f2257ca556f607e9e91337e67a0c12d40e73199 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f2257ca556f607e9e91337e6… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:25 2008 +0300 wined3d: Add device->isInDraw checks in LoadLocation. Prevents calling ActivateContext while holding gl lock, e.g. when preloading texture in sampler(). --- dlls/wined3d/surface.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8190a15..97f0438 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4043,7 +4043,7 @@ 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); + if(!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); surface_download_data(This); @@ -4101,7 +4101,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D } else { /* Upload from system memory */ 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); + if(!device->isInDraw) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); surface_bind_and_dirtify(This); ENTER_GL();

1 0

Alexander Dorofeyev : wined3d: LEAVE_GL when exiting with error in tesselate_rectpatch.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 5ccf91b70552270480bfb07a11bb3979e37478c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5ccf91b70552270480bfb07a1… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:04 2008 +0300 wined3d: LEAVE_GL when exiting with error in tesselate_rectpatch. --- dlls/wined3d/drawprim.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index fc09b75..43ee039 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -1372,11 +1372,13 @@ HRESULT tesselate_rectpatch(IWineD3DDeviceImpl *This, i = glRenderMode(GL_RENDER); if(i == -1) { + LEAVE_GL(); ERR("Feedback failed. Expected %d elements back\n", buffer_size); Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer); return WINED3DERR_DRIVERINTERNALERROR; } else if(i != buffer_size) { + LEAVE_GL(); ERR("Unexpected amount of elements returned. Expected %d, got %d\n", buffer_size, i); Sleep(10000); HeapFree(GetProcessHeap(), 0, feedbuffer);

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DQueryImpl_Release.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: f24289e49a07b934863fca588fd09225b05cb4dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=f24289e49a07b934863fca588… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:07 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DQueryImpl_Release. --- dlls/wined3d/query.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 4c343bf..f3b9cc6 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -62,6 +62,7 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { TRACE("(%p) : Releasing from %d\n", This, This->ref); ref = InterlockedDecrement(&This->ref); if (ref == 0) { + ENTER_GL(); if(This->type == WINED3DQUERYTYPE_EVENT) { if(GL_SUPPORT(APPLE_FENCE)) { GL_EXTCALL(glDeleteFencesAPPLE(1, &((WineQueryEventData *)(This->extendedData))->fenceId)); @@ -74,6 +75,7 @@ static ULONG WINAPI IWineD3DQueryImpl_Release(IWineD3DQuery *iface) { GL_EXTCALL(glDeleteQueriesARB(1, &((WineQueryOcclusionData *)(This->extendedData))->queryId)); checkGLcall("glDeleteQueriesARB"); } + LEAVE_GL(); HeapFree(GetProcessHeap(), 0, This->extendedData); HeapFree(GetProcessHeap(), 0, This);

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_ColorFill.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: a2017f4f212077298ca394260b796104c5185198 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a2017f4f212077298ca394260… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:58 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_ColorFill. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 538a79d..eed3541 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6208,7 +6208,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_ColorFill(IWineD3DDevice *iface, IWineD } if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + ENTER_GL(); color_fill_fbo(iface, pSurface, pRect, color); + LEAVE_GL(); return WINED3D_OK; } else { /* Just forward this to the DirectDraw blitting engine */

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_ResourceReleased.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2157c7d76c1f09084893d4ebee517975f5ed0390 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2157c7d76c1f09084893d4ebe… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:06:01 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_ResourceReleased. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index eed3541..b022c4e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -7362,6 +7362,7 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW } } + ENTER_GL(); for (i = 0; i < GL_LIMITS(buffers); ++i) { if (This->fbo_color_attachments[i] == (IWineD3DSurface *)resource) { bind_fbo(iface, GL_FRAMEBUFFER_EXT, &This->fbo); @@ -7374,6 +7375,7 @@ static void WINAPI IWineD3DDeviceImpl_ResourceReleased(IWineD3DDevice *iface, IW set_depth_stencil_fbo(iface, NULL); This->fbo_depth_attachment = NULL; } + LEAVE_GL(); } break;

1 0

Alexander Dorofeyev : wined3d: Don't copy the extra line.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 2f9e8a901cebf0c6c3c74e61c385322bfa7e212d URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f9e8a901cebf0c6c3c74e61c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:42 2008 +0300 wined3d: Don't copy the extra line. biSizeImage has an extra line added to it, and passing it to memcpy can cause a crash. --- dlls/wined3d/surface_base.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface_base.c b/dlls/wined3d/surface_base.c index 9b7f100..7f689e2 100644 --- a/dlls/wined3d/surface_base.c +++ b/dlls/wined3d/surface_base.c @@ -545,7 +545,7 @@ HRESULT IWineD3DBaseSurfaceImpl_CreateDIBSection(IWineD3DSurface *iface) { TRACE("DIBSection at : %p\n", This->dib.bitmap_data); /* copy the existing surface to the dib section */ if(This->resource.allocatedMemory) { - memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, b_info->bmiHeader.biSizeImage); + memcpy(This->dib.bitmap_data, This->resource.allocatedMemory, This->currentDesc.Height * IWineD3DSurface_GetPitch(iface)); } else { /* This is to make LockRect read the gl Texture although memory is allocated */ This->Flags &= ~SFLAG_INSYSMEM;

1 0

Alexander Dorofeyev : wined3d: Implement CONVERT_RGB32_888 conversion.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 29b38bc886c81aef906594c1c75974eb4aad155b URL: http://source.winehq.org/git/wine.git/?a=commit;h=29b38bc886c81aef906594c1c… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:48 2008 +0300 wined3d: Implement CONVERT_RGB32_888 conversion. --- dlls/wined3d/surface.c | 23 +++++++++++++++++++++++ 1 files changed, 23 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ddd0f32..8190a15 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1799,6 +1799,29 @@ HRESULT d3dfmt_convert_surface(BYTE *src, BYTE *dst, UINT pitch, UINT width, UIN } break; + case CONVERT_RGB32_888: + { + /* Converting X8R8G8B8 format to R8G8B8A8 with color-keying. */ + unsigned int x, y; + for (y = 0; y < height; y++) + { + source = src + pitch * y; + dest = dst + outpitch * y; + for (x = 0; x < width; x++) { + DWORD color = 0xffffff & *(DWORD*)source; + DWORD dstcolor = color << 8; + if ((color < This->SrcBltCKey.dwColorSpaceLowValue) || + (color > This->SrcBltCKey.dwColorSpaceHighValue)) { + dstcolor |= 0xff; + } + *(DWORD*)dest = dstcolor; + source += 4; + dest += 4; + } + } + } + break; + case CONVERT_V8U8: { unsigned int x, y;

1 0

Alexander Dorofeyev : wined3d: Add ENTER_GL/ LEAVE_GL in IWineD3DDeviceImpl_Uninit3D.
by Alexandre Julliard 07 Apr '08

07 Apr '08

Module: wine Branch: master Commit: 7c261553d059e2464d02e2626d2be77136ba2529 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c261553d059e2464d02e2626… Author: Alexander Dorofeyev <alexd4(a)inbox.lv> Date: Mon Apr 7 00:05:55 2008 +0300 wined3d: Add ENTER_GL/LEAVE_GL in IWineD3DDeviceImpl_Uninit3D. --- dlls/wined3d/device.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 25bd800..538a79d 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2232,7 +2232,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Uninit3D(IWineD3DDevice *iface, D3DCB_D /* Delete the palette conversion shader if it is around */ if(This->paletteConversionShader) { + ENTER_GL(); GL_EXTCALL(glDeleteProgramsARB(1, &This->paletteConversionShader)); + LEAVE_GL(); This->paletteConversionShader = 0; }

1 0