wine-commits June 2009

wine-commits@winehq.org

5 participants
1115 discussions

Henri Verbeet : wined3d: Simplify IWineD3DSurfaceImpl_LockRect() a bit.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c7b684f345c43c36c6f2cd23dcb5374c4dd7845e URL: http://source.winehq.org/git/wine.git/?a=commit;h=c7b684f345c43c36c6f2cd23d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:05 2009 +0200 wined3d: Simplify IWineD3DSurfaceImpl_LockRect() a bit. --- dlls/wined3d/surface.c | 77 ++++++++--------------------------------------- 1 files changed, 13 insertions(+), 64 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 58893f2..d398fb1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1296,6 +1296,7 @@ static void surface_prepare_system_memory(IWineD3DSurfaceImpl *This) { static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED3DLOCKED_RECT* pLockedRect, CONST RECT* pRect, DWORD Flags) { IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *)iface; IWineD3DDeviceImpl *myDevice = This->resource.wineD3DDevice; + const RECT *pass_rect = pRect; TRACE("(%p) : rect@%p flags(%08x), output lockedRect@%p, memory@%p\n", This, pRect, Flags, pLockedRect, This->resource.allocatedMemory); @@ -1328,72 +1329,19 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LockRect(IWineD3DSurface *iface, WINED goto lock_end; } - /* Now download the surface content from opengl - * Use the render target readback if the surface is on a swapchain(=onscreen render target) or the current primary target - * Offscreen targets which are not active at the moment or are higher targets(FBOs) can be locked with the texture path - */ - if ((This->Flags & SFLAG_SWAPCHAIN) || iface == myDevice->render_targets[0]) + /* IWineD3DSurface_LoadLocation() does not check if the rectangle specifies + * the full surface. Most callers don't need that, so do it here. */ + if (pRect && pRect->top == 0 && pRect->left == 0 + && pRect->right == This->currentDesc.Width + && pRect->bottom == This->currentDesc.Height) { - const RECT *pass_rect = pRect; - - /* IWineD3DSurface_LoadLocation does not check if the rectangle specifies the full surfaces - * because most caller functions do not need that. So do that here - */ - if(pRect && - pRect->top == 0 && - pRect->left == 0 && - pRect->right == This->currentDesc.Width && - pRect->bottom == This->currentDesc.Height) { - pass_rect = NULL; - } - - switch(wined3d_settings.rendertargetlock_mode) { - case RTL_TEXDRAW: - case RTL_TEXTEX: - FIXME("Reading from render target with a texture isn't implemented yet, falling back to framebuffer reading\n"); -#if 0 - /* Disabled for now. LoadLocation prefers the texture over the drawable as the source. So if we copy to the - * texture first, then to sysmem, we'll avoid glReadPixels and use glCopyTexImage and glGetTexImage2D instead. - * This may be faster on some cards - */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INTEXTURE, NULL /* No partial texture copy yet */); -#endif - /* drop through */ - - case RTL_AUTO: - case RTL_READDRAW: - case RTL_READTEX: - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pass_rect); - break; + pass_rect = NULL; + } - case RTL_DISABLE: - break; - } - } else if(iface == myDevice->stencilBufferTarget) { - /** the depth stencil in openGL has a format of GL_FLOAT - * which should be good for WINED3DFMT_D16_LOCKABLE - * and WINED3DFMT_D16 - * it is unclear what format the stencil buffer is in except. - * 'Each index is converted to fixed point... - * If GL_MAP_STENCIL is GL_TRUE, indices are replaced by their - * mappings in the table GL_PIXEL_MAP_S_TO_S. - * glReadPixels(This->lockedRect.left, - * This->lockedRect.bottom - j - 1, - * This->lockedRect.right - This->lockedRect.left, - * 1, - * GL_DEPTH_COMPONENT, - * type, - * (char *)pLockedRect->pBits + (pLockedRect->Pitch * (j-This->lockedRect.top))); - * - * Depth Stencil surfaces which are not the current depth stencil target should have their data in a - * gl texture(next path), or in local memory(early return because of set SFLAG_INSYSMEM above). If - * none of that is the case the problem is not in this function :-) - ********************************************/ - FIXME("Depth stencil locking not supported yet\n"); - } else { - /* This path is for normal surfaces, offscreen render targets and everything else that is in a gl texture */ - TRACE("locking an ordinary surface\n"); - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL /* no partial locking for textures yet */); + if (!(wined3d_settings.rendertargetlock_mode == RTL_DISABLE + && ((This->Flags & SFLAG_SWAPCHAIN) || iface == myDevice->render_targets[0]))) + { + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, pass_rect); } lock_end: @@ -4848,6 +4796,7 @@ static HRESULT WINAPI IWineD3DSurfaceImpl_LoadLocation(IWineD3DSurface *iface, D surface_download_data(This); } else { + /* Note: It might be faster to download into a texture first. */ read_from_framebuffer(This, rect, This->resource.allocatedMemory, IWineD3DSurface_GetPitch(iface));

1 0

Henri Verbeet : wined3d: Remove some useless code in IWineD3DDeviceImpl_SetLightEnable().
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 9f252cd81590ff6ce93d21a5aadd3dffd05e9845 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f252cd81590ff6ce93d21a5a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:04 2009 +0200 wined3d: Remove some useless code in IWineD3DDeviceImpl_SetLightEnable(). --- dlls/wined3d/device.c | 3 --- 1 files changed, 0 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 956bb4f..5378568 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2947,9 +2947,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_SetLightEnable(IWineD3DDevice *iface, D struct list *e; TRACE("(%p) : Idx(%d), enable? %d\n", This, Index, Enable); - /* Tests show true = 128...not clear why */ - Enable = Enable? 128: 0; - LIST_FOR_EACH(e, &This->updateStateBlock->lightMap[Hi]) { lightInfo = LIST_ENTRY(e, PLIGHTINFOEL, entry); if(lightInfo->OriginalIndex == Index) break;

1 0

Henri Verbeet : wined3d: Reuse the FBO for check_fbo_compat().
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 550a3bbf96cc2703f894284b354cae9084e86b9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=550a3bbf96cc2703f894284b3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:03 2009 +0200 wined3d: Reuse the FBO for check_fbo_compat(). --- dlls/wined3d/utils.c | 17 +++++++++++++---- 1 files changed, 13 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 1e3e3fb..881736e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -559,8 +559,8 @@ static BOOL init_format_compression_info(WineD3D_GL_Info *gl_info) static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_format, GLenum format, GLenum type) { - GLuint tex, fb; GLenum status; + GLuint tex; ENTER_GL(); @@ -571,12 +571,9 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); - GL_EXTCALL(glGenFramebuffersEXT(1, &fb)); - GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fb)); GL_EXTCALL(glFramebufferTexture2DEXT(GL_FRAMEBUFFER_EXT, GL_COLOR_ATTACHMENT0_EXT, GL_TEXTURE_2D, tex, 0)); status = GL_EXTCALL(glCheckFramebufferStatusEXT(GL_FRAMEBUFFER_EXT)); - GL_EXTCALL(glDeleteFramebuffersEXT(1, &fb)); glDeleteTextures(1, &tex); checkGLcall("Framebuffer format check"); @@ -589,6 +586,13 @@ static BOOL check_fbo_compat(const WineD3D_GL_Info *gl_info, GLint internal_form static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) { unsigned int i; + GLuint fbo; + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GL_EXTCALL(glGenFramebuffersEXT(1, &fbo)); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, fbo)); + } for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { @@ -652,6 +656,11 @@ static void init_format_fbo_compat_info(WineD3D_GL_Info *gl_info) desc->rtInternal = desc->glInternal; } } + + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) + { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &fbo)); + } } static BOOL init_format_texture_info(WineD3D_GL_Info *gl_info)

1 0

Henri Verbeet : wined3d: Make sure we have a context in stretch_rect_fbo().
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 41d93e1dd1198dbef176d45bc061042d78eca034 URL: http://source.winehq.org/git/wine.git/?a=commit;h=41d93e1dd1198dbef176d45bc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jun 18 09:04:02 2009 +0200 wined3d: Make sure we have a context in stretch_rect_fbo(). Specifically, in case the source surface was offscreen, we would sometimes to GL calls without active context. --- dlls/wined3d/device.c | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 7b55d6e..956bb4f 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6432,11 +6432,16 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED /* Attach src surface to src fbo */ src_swapchain = get_swapchain(src_surface); + dst_swapchain = get_swapchain(dst_surface); + + if (src_swapchain) ActivateContext(This, src_surface, CTXUSAGE_RESOURCELOAD); + else if (dst_swapchain) ActivateContext(This, dst_surface, CTXUSAGE_RESOURCELOAD); + else ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + if (src_swapchain) { GLenum buffer = surface_get_gl_buffer(src_surface, src_swapchain); 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); @@ -6471,12 +6476,10 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED LEAVE_GL(); /* Attach dst surface to dst fbo */ - dst_swapchain = get_swapchain(dst_surface); if (dst_swapchain) { GLenum buffer = surface_get_gl_buffer(dst_surface, dst_swapchain); 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); @@ -6503,11 +6506,6 @@ void stretch_rect_fbo(IWineD3DDevice *iface, IWineD3DSurface *src_surface, WINED } else { TRACE("Destination surface %p is offscreen\n", dst_surface); - /* No src or dst swapchain? Make sure some context is active(multithreading) */ - if(!src_swapchain) { - ActivateContext(This, This->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - } - ENTER_GL(); context_bind_fbo(iface, GL_DRAW_FRAMEBUFFER_EXT, &This->activeContext->dst_fbo); context_attach_surface_fbo(This, GL_DRAW_FRAMEBUFFER_EXT, 0, dst_surface);

1 0

Paul Vriens : comctl32/tests: Fix some typos (copy-paste).
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 87366355d25d8837a1366fd8b4f3490abba2e0f3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87366355d25d8837a1366fd8b… Author: Paul Vriens <Paul.Vriens.Wine(a)gmail.com> Date: Thu Jun 18 08:10:52 2009 +0200 comctl32/tests: Fix some typos (copy-paste). --- dlls/comctl32/tests/rebar.c | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/comctl32/tests/rebar.c b/dlls/comctl32/tests/rebar.c index d055d8a..c819bc7 100644 --- a/dlls/comctl32/tests/rebar.c +++ b/dlls/comctl32/tests/rebar.c @@ -104,7 +104,7 @@ static HWND build_toolbar(int nr, HWND hParent) case 1: iBitmapId = IDB_VIEW_SMALL_COLOR; break; case 2: iBitmapId = IDB_STD_SMALL_COLOR; break; } - ok(SendMessage(hToolbar, TB_LOADIMAGES, iBitmapId, (LPARAM)HINST_COMMCTRL) == 0, "TB_LOADIMAGE failed\n"); + ok(SendMessage(hToolbar, TB_LOADIMAGES, iBitmapId, (LPARAM)HINST_COMMCTRL) == 0, "TB_LOADIMAGES failed\n"); ok(SendMessage(hToolbar, TB_ADDBUTTONS, 5+nr, (LPARAM)btns), "TB_ADDBUTTONS failed\n"); return hToolbar; } @@ -310,7 +310,7 @@ static int rbsize_numtests = 0; count = SendMessage(hRebar, RB_GETBANDCOUNT, 0, 0); \ compare(count, res->nBands, "%d"); \ for (i=0; i<min(count, res->nBands); i++) { \ - ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_ITEMRECT\n"); \ + ok(SendMessageA(hRebar, RB_GETRECT, i, (LPARAM)&rc) == 1, "RB_GETRECT\n"); \ if (!(res->bands[i].fStyle & RBBS_HIDDEN)) \ check_rect("band", rc, res->bands[i].rc); \ rbi.cbSize = sizeof(REBARBANDINFO); \ @@ -790,12 +790,12 @@ static void bandinfo_test(void) rb.cyChild = 30; rb.cyMaxChild = 20; rb.cyIntegral = 10; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 0); rb.fMask = RBBIM_TEXT; rb.lpText = szABC; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 35); rb.cbSize = sizeof(REBARBANDINFO); @@ -806,21 +806,21 @@ static void bandinfo_test(void) rb.fMask = RBBIM_HEADERSIZE; rb.cxHeader = 50; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 50); rb.cxHeader = 5; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); rb.fMask = RBBIM_TEXT; rb.lpText = szABCD; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, 0x40000000, 0, GetSysColor(COLOR_3DFACE), "ABCD", -1, NULL, 15, 20, 0, NULL, 0, 0xdddddddd, 0xdddddddd, 0xdddddddd, 0, 0, 5); rb.fMask = RBBIM_STYLE | RBBIM_TEXT; rb.fStyle = RBBS_VARIABLEHEIGHT; rb.lpText = szABC; - ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_INSERTBAND failed\n"); + ok(SendMessageA(hRebar, RB_SETBANDINFOA, 0, (LPARAM)&rb), "RB_SETBANDINFO failed\n"); expect_band_content(0, RBBS_VARIABLEHEIGHT, 0, GetSysColor(COLOR_3DFACE), "ABC", -1, NULL, 15, 20, 0, NULL, 0, 20, 0x7fffffff, 0, 0, 0, 40); DestroyWindow(hRebar);

1 0

Stefan Doesinger : wined3d: Properly load the y correction.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 3aaa530ca95a63591f1443d279a0e32705e4dfc0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3aaa530ca95a63591f1443d27… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Wed Jun 17 19:17:14 2009 +0200 wined3d: Properly load the y correction. --- dlls/wined3d/arb_program_shader.c | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 729e6ce..6101e55 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -334,6 +334,22 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } checkGLcall("Load bumpmap consts\n"); + if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) + { + /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). + * ycorrection.y: -1.0(onscreen), 1.0(offscreen) + * ycorrection.z: 1.0 + * ycorrection.w: 0.0 + */ + float val[4]; + val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; + val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; + val[2] = 1.0; + val[3] = 0.0; + GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); + checkGLcall("y correction loading\n"); + } + if(gl_shader->num_int_consts == 0) return; for(i = 0; i < MAX_CONST_I; i++) @@ -350,22 +366,6 @@ static inline void shader_arb_ps_local_constants(IWineD3DDeviceImpl* deviceImpl) } } checkGLcall("Load ps int consts\n"); - - if(gl_shader->ycorrection != WINED3D_CONST_NUM_UNUSED) - { - /* ycorrection.x: Backbuffer height(onscreen) or 0(offscreen). - * ycorrection.y: -1.0(onscreen), 1.0(offscreen) - * ycorrection.z: 1.0 - * ycorrection.w: 0.0 - */ - float val[4]; - val[0] = deviceImpl->render_offscreen ? 0.0 : ((IWineD3DSurfaceImpl *) deviceImpl->render_targets[0])->currentDesc.Height; - val[1] = deviceImpl->render_offscreen ? 1.0 : -1.0; - val[2] = 1.0; - val[3] = 0.0; - GL_EXTCALL(glProgramLocalParameter4fvARB(GL_FRAGMENT_PROGRAM_ARB, gl_shader->ycorrection, val)); - checkGLcall("y correction loading\n"); - } } static inline void shader_arb_vs_local_constants(IWineD3DDeviceImpl* deviceImpl)

1 0

Stefan Doesinger : wined3d: Properly free srgb textures.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 7d5285acc12c5b5f52fdaababd9d4e2ab60b3a85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7d5285acc12c5b5f52fdaabab… Author: Stefan Doesinger <stefan(a)codeweavers.com> Date: Tue Jun 9 23:01:02 2009 -0700 wined3d: Properly free srgb textures. --- dlls/wined3d/basetexture.c | 22 ++++++++-------------- dlls/wined3d/surface.c | 2 ++ 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index aeec963..547ed1e 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -53,19 +53,7 @@ HRESULT basetexture_init(IWineD3DBaseTextureImpl *texture, UINT levels, WINED3DR void basetexture_cleanup(IWineD3DBaseTexture *iface) { - IWineD3DBaseTextureImpl *This = (IWineD3DBaseTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; - - TRACE("(%p) : textureName(%d)\n", This, This->baseTexture.textureName); - if (This->baseTexture.textureName != 0) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - TRACE("(%p) : Deleting texture %d\n", This, This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.srgbTextureName); - LEAVE_GL(); - } - + basetexture_unload(iface); resource_cleanup((IWineD3DResource *)iface); } @@ -78,8 +66,14 @@ void basetexture_unload(IWineD3DBaseTexture *iface) ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); ENTER_GL(); glDeleteTextures(1, &This->baseTexture.textureName); - glDeleteTextures(1, &This->baseTexture.srgbTextureName); This->baseTexture.textureName = 0; + LEAVE_GL(); + } + + if(This->baseTexture.srgbTextureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.srgbTextureName); This->baseTexture.srgbTextureName = 0; LEAVE_GL(); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 400a652..58893f2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -892,6 +892,8 @@ static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { ENTER_GL(); glDeleteTextures(1, &This->glDescription.textureName); This->glDescription.textureName = 0; + glDeleteTextures(1, &This->glDescription.srgbTextureName); + This->glDescription.srgbTextureName = 0; LEAVE_GL(); } else { IWineD3DBaseTexture_Release(texture);

1 0

Michael Abbott : wined3d: Remove division from inner loop.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 2e119a2718ccb3cdf32277c5985bc2bb55c52a34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e119a2718ccb3cdf32277c59… Author: Michael Abbott <michael(a)araneidae.co.uk> Date: Tue Jun 16 16:20:05 2009 +0100 wined3d: Remove division from inner loop. --- dlls/wined3d/surface.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index eedc257..400a652 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2461,9 +2461,11 @@ static HRESULT d3dfmt_convert_surface(const BYTE *src, BYTE *dst, UINT pitch, UI for (x = 0; x < width; ++x) { - /* The depth data is normalized, so needs to be scaled, the stencil data isn't. */ - WORD d15 = source[x] & 0xfffe; - DWORD d24 = d15 * 0x100 + (d15 * 0xff80 + 0x3fff80) / 0x7fff00; + /* The depth data is normalized, so needs to be scaled, + * the stencil data isn't. Scale depth data by + * (2^24-1)/(2^15-1) ~~ (2^9 + 2^-6). */ + WORD d15 = source[x] >> 1; + DWORD d24 = (d15 << 9) + (d15 >> 6); dest[x] = (d24 << 8) | (source[x] & 0x1); } }

1 0

Alexandre Julliard : kernel32: Fix the HGLOBAL header size for 64-bit.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: c6dffb6df8578733c69fb35fd8d9079e091b3880 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6dffb6df8578733c69fb35fd… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 20:53:46 2009 +0200 kernel32: Fix the HGLOBAL header size for 64-bit. --- dlls/kernel32/heap.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index c78c762..93cf545 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -320,7 +320,7 @@ BOOL WINAPI HeapSetInformation( HANDLE heap, HEAP_INFORMATION_CLASS infoclass, P * size = 8*k, where k=1,2,3,... alloc's exactly the given size. * The Minolta DiMAGE Image Viewer heavily relies on this, corrupting * the output jpeg's > 1 MB if not */ -#define HGLOBAL_STORAGE 8 /* sizeof(HGLOBAL)*2 */ +#define HGLOBAL_STORAGE (sizeof(HGLOBAL)*2) #include "pshpack1.h"

1 0

Alexandre Julliard : server: The ptrace interfaces uses longs, not ints.
by Alexandre Julliard 18 Jun '09

18 Jun '09

Module: wine Branch: master Commit: 034c6c3e5809afcca8b3d319aa28832e0c00f7ff URL: http://source.winehq.org/git/wine.git/?a=commit;h=034c6c3e5809afcca8b3d319a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Jun 17 20:53:32 2009 +0200 server: The ptrace interfaces uses longs, not ints. --- server/ptrace.c | 93 ++++++++++++++++++++++++++++--------------------------- 1 files changed, 47 insertions(+), 46 deletions(-) diff --git a/server/ptrace.c b/server/ptrace.c index 72e2b44..4fa48ec 100644 --- a/server/ptrace.c +++ b/server/ptrace.c @@ -313,8 +313,8 @@ static int suspend_for_ptrace( struct thread *thread ) return 0; } -/* read an int from a thread address space */ -static int read_thread_int( struct thread *thread, int *addr, int *data ) +/* read a long from a thread address space */ +static long read_thread_long( struct thread *thread, long *addr, long *data ) { errno = 0; *data = ptrace( PTRACE_PEEKDATA, get_ptrace_pid(thread), (caddr_t)addr, 0 ); @@ -326,13 +326,13 @@ static int read_thread_int( struct thread *thread, int *addr, int *data ) return 0; } -/* write an int to a thread address space */ -static int write_thread_int( struct thread *thread, int *addr, int data, unsigned int mask ) +/* write a long to a thread address space */ +static long write_thread_long( struct thread *thread, long *addr, long data, unsigned long mask ) { - int res; + long res; if (mask != ~0u) { - if (read_thread_int( thread, addr, &res ) == -1) return -1; + if (read_thread_long( thread, addr, &res ) == -1) return -1; data = (data & mask) | (res & ~mask); } if ((res = ptrace( PTRACE_POKEDATA, get_ptrace_pid(thread), (caddr_t)addr, data )) == -1) @@ -358,7 +358,7 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t { struct thread *thread = get_ptrace_thread( process ); unsigned int first_offset, last_offset, len; - int data, *addr; + long data, *addr; if (!thread) return 0; @@ -368,33 +368,33 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t return 0; } - first_offset = ptr % sizeof(int); - last_offset = (size + first_offset) % sizeof(int); - if (!last_offset) last_offset = sizeof(int); + first_offset = ptr % sizeof(long); + last_offset = (size + first_offset) % sizeof(long); + if (!last_offset) last_offset = sizeof(long); - addr = (int *)(unsigned long)(ptr - first_offset); - len = (size + first_offset + sizeof(int) - 1) / sizeof(int); + addr = (long *)(unsigned long)(ptr - first_offset); + len = (size + first_offset + sizeof(long) - 1) / sizeof(long); if (suspend_for_ptrace( thread )) { if (len > 1) { - if (read_thread_int( thread, addr++, &data ) == -1) goto done; - memcpy( dest, (char *)&data + first_offset, sizeof(int) - first_offset ); - dest += sizeof(int) - first_offset; + if (read_thread_long( thread, addr++, &data ) == -1) goto done; + memcpy( dest, (char *)&data + first_offset, sizeof(long) - first_offset ); + dest += sizeof(long) - first_offset; first_offset = 0; len--; } while (len > 1) { - if (read_thread_int( thread, addr++, &data ) == -1) goto done; - memcpy( dest, &data, sizeof(int) ); - dest += sizeof(int); + if (read_thread_long( thread, addr++, &data ) == -1) goto done; + memcpy( dest, &data, sizeof(long) ); + dest += sizeof(long); len--; } - if (read_thread_int( thread, addr++, &data ) == -1) goto done; + if (read_thread_long( thread, addr++, &data ) == -1) goto done; memcpy( dest, (char *)&data + first_offset, last_offset - first_offset ); len--; @@ -406,28 +406,29 @@ int read_process_memory( struct process *process, client_ptr_t ptr, data_size_t /* make sure we can write to the whole address range */ /* len is the total size (in ints) */ -static int check_process_write_access( struct thread *thread, int *addr, data_size_t len ) +static int check_process_write_access( struct thread *thread, long *addr, data_size_t len ) { int page = get_page_size() / sizeof(int); for (;;) { - if (write_thread_int( thread, addr, 0, 0 ) == -1) return 0; + if (write_thread_long( thread, addr, 0, 0 ) == -1) return 0; if (len <= page) break; addr += page; len -= page; } - return (write_thread_int( thread, addr + len - 1, 0, 0 ) != -1); + return (write_thread_long( thread, addr + len - 1, 0, 0 ) != -1); } /* write data to a process memory space */ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t size, const char *src ) { struct thread *thread = get_ptrace_thread( process ); - int ret = 0, data = 0; + int ret = 0; + long data = 0; data_size_t len; - int *addr; - unsigned int first_mask, first_offset, last_mask, last_offset; + long *addr; + unsigned long first_mask, first_offset, last_mask, last_offset; if (!thread) return 0; @@ -437,19 +438,19 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t return 0; } - /* compute the mask for the first int */ + /* compute the mask for the first long */ first_mask = ~0; - first_offset = ptr % sizeof(int); + first_offset = ptr % sizeof(long); memset( &first_mask, 0, first_offset ); - /* compute the mask for the last int */ - last_offset = (size + first_offset) % sizeof(int); - if (!last_offset) last_offset = sizeof(int); + /* compute the mask for the last long */ + last_offset = (size + first_offset) % sizeof(long); + if (!last_offset) last_offset = sizeof(long); last_mask = 0; memset( &last_mask, 0xff, last_offset ); - addr = (int *)(unsigned long)(ptr - first_offset); - len = (size + first_offset + sizeof(int) - 1) / sizeof(int); + addr = (long *)(unsigned long)(ptr - first_offset); + len = (size + first_offset + sizeof(long) - 1) / sizeof(long); if (suspend_for_ptrace( thread )) { @@ -461,9 +462,9 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t /* first word is special */ if (len > 1) { - memcpy( (char *)&data + first_offset, src, sizeof(int) - first_offset ); - src += sizeof(int) - first_offset; - if (write_thread_int( thread, addr++, data, first_mask ) == -1) goto done; + memcpy( (char *)&data + first_offset, src, sizeof(long) - first_offset ); + src += sizeof(long) - first_offset; + if (write_thread_long( thread, addr++, data, first_mask ) == -1) goto done; first_offset = 0; len--; } @@ -471,15 +472,15 @@ int write_process_memory( struct process *process, client_ptr_t ptr, data_size_t while (len > 1) { - memcpy( &data, src, sizeof(int) ); - src += sizeof(int); - if (write_thread_int( thread, addr++, data, ~0 ) == -1) goto done; + memcpy( &data, src, sizeof(long) ); + src += sizeof(long); + if (write_thread_long( thread, addr++, data, ~0ul ) == -1) goto done; len--; } /* last word is special too */ memcpy( (char *)&data + first_offset, src, last_offset - first_offset ); - if (write_thread_int( thread, addr, data, last_mask ) == -1) goto done; + if (write_thread_long( thread, addr, data, last_mask ) == -1) goto done; ret = 1; done: @@ -504,13 +505,13 @@ void get_selector_entry( struct thread *thread, int entry, unsigned int *base, } if (suspend_for_ptrace( thread )) { - unsigned char flags_buf[4]; - int *addr = (int *)(unsigned long)thread->process->ldt_copy + entry; - if (read_thread_int( thread, addr, (int *)base ) == -1) goto done; - if (read_thread_int( thread, addr + 8192, (int *)limit ) == -1) goto done; - addr = (int *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry >> 2); - if (read_thread_int( thread, addr, (int *)flags_buf ) == -1) goto done; - *flags = flags_buf[entry & 3]; + unsigned char flags_buf[sizeof(long)]; + long *addr = (long *)(unsigned long)thread->process->ldt_copy + entry; + if (read_thread_long( thread, addr, (long *)base ) == -1) goto done; + if (read_thread_long( thread, addr + 8192, (long *)limit ) == -1) goto done; + addr = (long *)(unsigned long)thread->process->ldt_copy + 2*8192 + (entry / sizeof(long)); + if (read_thread_long( thread, addr, (long *)flags_buf ) == -1) goto done; + *flags = flags_buf[entry % sizeof(long)]; done: resume_after_ptrace( thread ); }

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2009