February 2008 - Wine-Commits

Stefan Dösinger : wined3d: Make Clear aware of the depth stencil sharing.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 1424e7fd09f935ed5b2d64fe06a7e86ee8e4ae86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1424e7fd09f935ed5b2d64fe0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 27 14:11:16 2008 +0100 wined3d: Make Clear aware of the depth stencil sharing. --- dlls/wined3d/device.c | 21 +++++++++++++++++++++ dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 24 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index f0bac3e..c159674 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -4800,6 +4800,7 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa RECT vp_rect; WINED3DVIEWPORT *vp = &This->stateBlock->viewport; UINT drawable_width, drawable_height; + IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *) This->stencilBufferTarget; /* When we're clearing parts of the drawable, make sure that the target surface is well up to date in the * drawable. After the clear we'll mark the drawable up to date, so we have to make sure that this is true @@ -4858,6 +4859,26 @@ HRESULT IWineD3DDeviceImpl_ClearSurface(IWineD3DDeviceImpl *This, IWineD3DSurfa checkGLcall("glClearDepth"); glMask = glMask | GL_DEPTH_BUFFER_BIT; IWineD3DDeviceImpl_MarkStateDirty(This, STATE_RENDER(WINED3DRS_ZWRITEENABLE)); + + if(This->depth_copy_state == WINED3D_DCS_COPY) { + if(vp->X != 0 || vp->Y != 0 || + vp->Width < depth_stencil->currentDesc.Width || vp->Height < depth_stencil->currentDesc.Height) { + depth_copy((IWineD3DDevice *) This); + } + else if(This->stateBlock->renderState[WINED3DRS_SCISSORTESTENABLE] && ( + This->stateBlock->scissorRect.left > 0 || This->stateBlock->scissorRect.top > 0 || + This->stateBlock->scissorRect.right < depth_stencil->currentDesc.Width || + This->stateBlock->scissorRect.bottom < depth_stencil->currentDesc.Height)) { + depth_copy((IWineD3DDevice *) This); + } + else if(Count > 0 && pRects && ( + pRects[0].x1 > 0 || pRects[0].y1 > 0 || + pRects[0].x2 < depth_stencil->currentDesc.Width || + pRects[0].y2 < depth_stencil->currentDesc.Height)) { + depth_copy((IWineD3DDevice *) This); + } + } + This->depth_copy_state = WINED3D_DCS_INITIAL; } if (Flags & WINED3DCLEAR_TARGET) { diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 70a8c46..2ece349 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -757,7 +757,7 @@ static void depth_blt(IWineD3DDevice *iface, GLuint texture) { This->shader_backend->shader_select(iface, use_ps(This), use_vs(This)); } -static void depth_copy(IWineD3DDevice *iface) { +void depth_copy(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; IWineD3DSurfaceImpl *depth_stencil = (IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 27b1dc1..21c37cb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -411,6 +411,8 @@ extern glAttribFunc normal_funcs[WINED3DDECLTYPE_UNUSED]; #define GET_TEXCOORD_SIZE_FROM_FVF(d3dvtVertexType, tex_num) \ (((((d3dvtVertexType) >> (16 + (2 * (tex_num)))) + 1) & 0x03) + 1) +void depth_copy(IWineD3DDevice *iface); + /* Routines and structures related to state management */ typedef struct WineD3DContext WineD3DContext; typedef void (*APPLYSTATEFUNC)(DWORD state, IWineD3DStateBlockImpl *stateblock, WineD3DContext *ctx);

1 0

Stefan Dösinger : d3d9: Some drivers allow non-aligned offsets.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 451d85a71c5d128f487cb081a9eddfd5c682ea9e URL: http://source.winehq.org/git/wine.git/?a=commit;h=451d85a71c5d128f487cb081a… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 27 14:02:00 2008 +0100 d3d9: Some drivers allow non-aligned offsets. --- dlls/d3d9/tests/device.c | 40 ++++++++++++++++++++++------------------ 1 files changed, 22 insertions(+), 18 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 8ad5d63..bba4eb2 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -1755,34 +1755,38 @@ static void test_set_stream_source(void) hr = IDirect3DDevice9_CreateVertexBuffer( device, 512, 0, 0, D3DPOOL_DEFAULT, &pVertexBuffer, NULL ); ok(hr == D3D_OK, "Failed to create a vertex buffer, hr = %s\n", DXGetErrorString9(hr)); if (SUCCEEDED(hr)) { - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 0, 32); - ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 1, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 2, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 3, 32); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", - DXGetErrorString9(hr)); - hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 4, 32); - ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", - DXGetErrorString9(hr)); + /* Some cards(Geforce 7400 at least) accept non-aligned offsets, others(radeon 9000 verified) reject it, + * so accept both results. Wine currently rejects this to be able to optimize the vbo conversion, but writes + * a WARN + */ + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 0, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 1, 32); + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 1, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 2, 32); + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 2, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 3, 32); + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 3, hr = %s\n", + DXGetErrorString9(hr)); + hr = IDirect3DDevice9_SetStreamSource(device, 0, pVertexBuffer, 4, 32); + ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n", + DXGetErrorString9(hr)); } /* Try to set the NULL buffer with an offset and stride 0 */ hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 0, 0); ok(hr == D3D_OK, "Failed to set the stream source, offset 0, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 1, 0); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 1, hr = %s\n", + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 1, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 2, 0); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 2, hr = %s\n", + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 2, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 3, 0); - ok(hr == D3DERR_INVALIDCALL, "Unexpected result when setting the stream source, offset 3, hr = %s\n", + ok(hr == D3DERR_INVALIDCALL || hr == D3D_OK, "Unexpected result when setting the stream source, offset 3, hr = %s\n", DXGetErrorString9(hr)); hr = IDirect3DDevice9_SetStreamSource(device, 0, NULL, 4, 0); ok(hr == D3D_OK, "Failed to set the stream source, offset 4, hr = %s\n",

1 0

Stefan Dösinger : wined3d: De-Statify depth blit opengl resources.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 3d2aa7afa064595e9481b0cdf10c42b51b700f2f URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d2aa7afa064595e9481b0cdf… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Sun Jan 27 14:32:40 2008 +0100 wined3d: De-Statify depth blit opengl resources. --- dlls/wined3d/arb_program_shader.c | 25 +++++++++++++++++++------ dlls/wined3d/baseshader.c | 2 ++ dlls/wined3d/device.c | 10 +++++++++- dlls/wined3d/drawprim.c | 9 ++++----- dlls/wined3d/glsl_shader.c | 20 +++++++++++++++----- dlls/wined3d/wined3d_private.h | 5 +++++ 6 files changed, 54 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 2117d13..84516c3 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -1713,18 +1713,30 @@ static void shader_arb_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { static void shader_arb_select_depth_blt(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - static GLuint vprogram_id = 0; - static GLuint fprogram_id = 0; - if (!vprogram_id) vprogram_id = create_arb_blt_vertex_program(gl_info); - GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, vprogram_id)); + if (!This->depth_blt_vprogram_id) This->depth_blt_vprogram_id = create_arb_blt_vertex_program(gl_info); + GL_EXTCALL(glBindProgramARB(GL_VERTEX_PROGRAM_ARB, This->depth_blt_vprogram_id)); glEnable(GL_VERTEX_PROGRAM_ARB); - if (!fprogram_id) fprogram_id = create_arb_blt_fragment_program(gl_info); - GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, fprogram_id)); + if (!This->depth_blt_fprogram_id) This->depth_blt_fprogram_id = create_arb_blt_fragment_program(gl_info); + GL_EXTCALL(glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, This->depth_blt_fprogram_id)); glEnable(GL_FRAGMENT_PROGRAM_ARB); } +static void shader_arb_destroy_depth_blt(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + + if(This->depth_blt_vprogram_id) { + GL_EXTCALL(glDeleteProgramsARB(1, &This->depth_blt_vprogram_id)); + This->depth_blt_vprogram_id = 0; + } + if(This->depth_blt_fprogram_id) { + GL_EXTCALL(glDeleteProgramsARB(1, &This->depth_blt_fprogram_id)); + This->depth_blt_fprogram_id = 0; + } +} + static void shader_arb_cleanup(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; @@ -1747,6 +1759,7 @@ static void shader_arb_destroy(IWineD3DBaseShader *iface) { const shader_backend_t arb_program_shader_backend = { &shader_arb_select, &shader_arb_select_depth_blt, + &shader_arb_destroy_depth_blt, &shader_arb_load_constants, &shader_arb_cleanup, &shader_arb_color_correction, diff --git a/dlls/wined3d/baseshader.c b/dlls/wined3d/baseshader.c index f4c101f..e06d7f7 100644 --- a/dlls/wined3d/baseshader.c +++ b/dlls/wined3d/baseshader.c @@ -1098,6 +1098,7 @@ void shader_trace_init( static void shader_none_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) {} static void shader_none_select_depth_blt(IWineD3DDevice *iface) {} +static void shader_none_destroy_depth_blt(IWineD3DDevice *iface) {} static void shader_none_load_constants(IWineD3DDevice *iface, char usePS, char useVS) {} static void shader_none_cleanup(IWineD3DDevice *iface) {} static void shader_none_color_correction(SHADER_OPCODE_ARG* arg) {} @@ -1106,6 +1107,7 @@ static void shader_none_destroy(IWineD3DBaseShader *iface) {} const shader_backend_t none_shader_backend = { &shader_none_select, &shader_none_select_depth_blt, + &shader_none_destroy_depth_blt, &shader_none_load_constants, &shader_none_cleanup, &shader_none_color_correction, diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index a2509a7..f0bac3e 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6897,7 +6897,15 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader); } - if(pPresentationParameters->Windowed) { + if(This->depth_blt_texture) { + ENTER_GL(); + glDeleteTextures(1, &This->depth_blt_texture); + LEAVE_GL(); + This->depth_blt_texture = 0; + } + This->shader_backend->shader_destroy_depth_blt(iface); + + if(pPresentationParameters->Windowed) { mode.Width = swapchain->orig_width; mode.Height = swapchain->orig_height; mode.RefreshRate = 0; diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 5d4d536..70a8c46 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -773,20 +773,19 @@ static void depth_copy(IWineD3DDevice *iface) { } if (This->render_offscreen) { - static GLuint tmp_texture = 0; GLint old_binding = 0; TRACE("Copying onscreen depth buffer to offscreen surface\n"); - if (!tmp_texture) { - glGenTextures(1, &tmp_texture); + if (!This->depth_blt_texture) { + glGenTextures(1, &This->depth_blt_texture); } /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); glGetIntegerv(GL_TEXTURE_BINDING_2D, &old_binding); - glBindTexture(GL_TEXTURE_2D, tmp_texture); + glBindTexture(GL_TEXTURE_2D, This->depth_blt_texture); glCopyTexImage2D(depth_stencil->glDescription.target, depth_stencil->glDescription.level, depth_stencil->glDescription.glFormatInternal, @@ -802,7 +801,7 @@ static void depth_copy(IWineD3DDevice *iface) { GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, This->fbo)); checkGLcall("glBindFramebuffer()"); - depth_blt(iface, tmp_texture); + depth_blt(iface, This->depth_blt_texture); checkGLcall("depth_blt"); } else { TRACE("Copying offscreen surface to onscreen depth buffer\n"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 64ca8b1..5572231 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3229,18 +3229,27 @@ static void shader_glsl_select(IWineD3DDevice *iface, BOOL usePS, BOOL useVS) { static void shader_glsl_select_depth_blt(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; - static GLhandleARB program_id = 0; static GLhandleARB loc = -1; - if (!program_id) { - program_id = create_glsl_blt_shader(gl_info); - loc = GL_EXTCALL(glGetUniformLocationARB(program_id, "sampler")); + if (!This->depth_blt_glsl_program_id) { + This->depth_blt_glsl_program_id = create_glsl_blt_shader(gl_info); + loc = GL_EXTCALL(glGetUniformLocationARB(This->depth_blt_glsl_program_id, "sampler")); } - GL_EXTCALL(glUseProgramObjectARB(program_id)); + GL_EXTCALL(glUseProgramObjectARB(This->depth_blt_glsl_program_id)); GL_EXTCALL(glUniform1iARB(loc, 0)); } +static void shader_glsl_destroy_depth_blt(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; + WineD3D_GL_Info *gl_info = &This->adapter->gl_info; + + if(This->depth_blt_glsl_program_id) { + GL_EXTCALL(glDeleteObjectARB(This->depth_blt_glsl_program_id)); + This->depth_blt_glsl_program_id = 0; + } +} + static void shader_glsl_cleanup(IWineD3DDevice *iface) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *)iface; WineD3D_GL_Info *gl_info = &This->adapter->gl_info; @@ -3285,6 +3294,7 @@ static void shader_glsl_destroy(IWineD3DBaseShader *iface) { const shader_backend_t glsl_shader_backend = { &shader_glsl_select, &shader_glsl_select_depth_blt, + &shader_glsl_destroy_depth_blt, &shader_glsl_load_constants, &shader_glsl_cleanup, &shader_glsl_color_correction, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index bb99148..27b1dc1 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -196,6 +196,7 @@ struct SHADER_OPCODE_ARG; typedef struct { void (*shader_select)(IWineD3DDevice *iface, BOOL usePS, BOOL useVS); void (*shader_select_depth_blt)(IWineD3DDevice *iface); + void (*shader_destroy_depth_blt)(IWineD3DDevice *iface); void (*shader_load_constants)(IWineD3DDevice *iface, char usePS, char useVS); void (*shader_cleanup)(IWineD3DDevice *iface); void (*shader_color_correction)(struct SHADER_OPCODE_ARG *arg); @@ -701,6 +702,10 @@ struct IWineD3DDeviceImpl GLuint src_fbo; GLuint dst_fbo; GLenum *draw_buffers; + GLuint depth_blt_texture; + GLuint depth_blt_vprogram_id; + GLuint depth_blt_fprogram_id; + GLhandleARB depth_blt_glsl_program_id; /* Cursor management */ BOOL bCursorVisible;

1 0

Stefan Dösinger : wined3d: Mark textures dirty on UnLoad.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 093d7d00c5008c4b8be8f3357f3d3d988bd8a12b URL: http://source.winehq.org/git/wine.git/?a=commit;h=093d7d00c5008c4b8be8f3357… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:18:55 2008 +0100 wined3d: Mark textures dirty on UnLoad. --- dlls/wined3d/basetexture.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index da574a1..8015f7d 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -122,6 +122,7 @@ void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface This->baseTexture.textureName = 0; LEAVE_GL(); } + This->baseTexture.dirty = TRUE; } WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface) {

1 0

Stefan Dösinger : wined3d: Move some UnLoad code to the base texture class.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: a0f2e6e55e467aa48c2833e12981323da10c16c9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0f2e6e55e467aa48c2833e12… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:18:06 2008 +0100 wined3d: Move some UnLoad code to the base texture class. --- dlls/wined3d/basetexture.c | 11 ++++++++++- dlls/wined3d/cubetexture.c | 9 +-------- dlls/wined3d/texture.c | 9 +-------- dlls/wined3d/volumetexture.c | 9 +-------- dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 14 insertions(+), 25 deletions(-) diff --git a/dlls/wined3d/basetexture.c b/dlls/wined3d/basetexture.c index a4ad820..da574a1 100644 --- a/dlls/wined3d/basetexture.c +++ b/dlls/wined3d/basetexture.c @@ -112,7 +112,16 @@ void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *ifac } void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface) { - IWineD3DResourceImpl_UnLoad((IWineD3DResource *)iface); + IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; + IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; + + if(This->baseTexture.textureName) { + ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); + ENTER_GL(); + glDeleteTextures(1, &This->baseTexture.textureName); + This->baseTexture.textureName = 0; + LEAVE_GL(); + } } WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface) { diff --git a/dlls/wined3d/cubetexture.c b/dlls/wined3d/cubetexture.c index 6704b17..9e0769d 100644 --- a/dlls/wined3d/cubetexture.c +++ b/dlls/wined3d/cubetexture.c @@ -161,7 +161,6 @@ static void WINAPI IWineD3DCubeTextureImpl_PreLoad(IWineD3DCubeTexture *iface) { static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) { unsigned int i, j; IWineD3DCubeTextureImpl *This = (IWineD3DCubeTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("(%p)\n", This); /* Unload all the surfaces and reset the texture name. If UnLoad was called on the @@ -175,13 +174,7 @@ static void WINAPI IWineD3DCubeTextureImpl_UnLoad(IWineD3DCubeTexture *iface) { } } - if(This->baseTexture.textureName) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - glDeleteTextures(1, &This->baseTexture.textureName); - This->baseTexture.textureName = 0; - LEAVE_GL(); - } + IWineD3DBaseTextureImpl_UnLoad((IWineD3DBaseTexture *) iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DCubeTextureImpl_GetType(IWineD3DCubeTexture *iface) { diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index fe37e55..727636d 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -145,7 +145,6 @@ static void WINAPI IWineD3DTextureImpl_PreLoad(IWineD3DTexture *iface) { static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { unsigned int i; IWineD3DTextureImpl *This = (IWineD3DTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("(%p)\n", This); /* Unload all the surfaces and reset the texture name. If UnLoad was called on the @@ -157,13 +156,7 @@ static void WINAPI IWineD3DTextureImpl_UnLoad(IWineD3DTexture *iface) { IWineD3DSurface_SetGlTextureDesc(This->surfaces[i], 0, IWineD3DTexture_GetTextureDimensions(iface)); } - if(This->baseTexture.textureName) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - glDeleteTextures(1, &This->baseTexture.textureName); - This->baseTexture.textureName = 0; - LEAVE_GL(); - } + IWineD3DBaseTextureImpl_UnLoad((IWineD3DBaseTexture *) iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DTextureImpl_GetType(IWineD3DTexture *iface) { diff --git a/dlls/wined3d/volumetexture.c b/dlls/wined3d/volumetexture.c index 9cddb4f..6639f9c 100644 --- a/dlls/wined3d/volumetexture.c +++ b/dlls/wined3d/volumetexture.c @@ -138,7 +138,6 @@ static void WINAPI IWineD3DVolumeTextureImpl_PreLoad(IWineD3DVolumeTexture *ifac static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface) { unsigned int i; IWineD3DVolumeTextureImpl *This = (IWineD3DVolumeTextureImpl *)iface; - IWineD3DDeviceImpl *device = This->resource.wineD3DDevice; TRACE("(%p)\n", This); /* Unload all the surfaces and reset the texture name. If UnLoad was called on the @@ -149,13 +148,7 @@ static void WINAPI IWineD3DVolumeTextureImpl_UnLoad(IWineD3DVolumeTexture *iface IWineD3DVolume_UnLoad(This->volumes[i]); } - if(This->baseTexture.textureName) { - ActivateContext(device, device->lastActiveRenderTarget, CTXUSAGE_RESOURCELOAD); - ENTER_GL(); - glDeleteTextures(1, &This->baseTexture.textureName); - This->baseTexture.textureName = 0; - LEAVE_GL(); - } + IWineD3DBaseTextureImpl_UnLoad((IWineD3DBaseTexture *) iface); } static WINED3DRESOURCETYPE WINAPI IWineD3DVolumeTextureImpl_GetType(IWineD3DVolumeTexture *iface) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 86f7869..bb99148 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1622,6 +1622,7 @@ unsigned int count_bits(unsigned int mask); extern DWORD WINAPI IWineD3DBaseTextureImpl_SetPriority(IWineD3DBaseTexture *iface, DWORD PriorityNew); extern DWORD WINAPI IWineD3DBaseTextureImpl_GetPriority(IWineD3DBaseTexture *iface); extern void WINAPI IWineD3DBaseTextureImpl_PreLoad(IWineD3DBaseTexture *iface); + extern void WINAPI IWineD3DBaseTextureImpl_UnLoad(IWineD3DBaseTexture *iface); extern WINED3DRESOURCETYPE WINAPI IWineD3DBaseTextureImpl_GetType(IWineD3DBaseTexture *iface); /*** IWineD3DBaseTexture methods ***/ extern DWORD WINAPI IWineD3DBaseTextureImpl_SetLOD(IWineD3DBaseTexture *iface, DWORD LODNew);

1 0

Stefan Dösinger : wined3d: Destroy FBOs and reset pointers on Reset.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 4c99bd5f87adc1c035c8efff1d8e0169505ccbcb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c99bd5f87adc1c035c8efff1… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:13:27 2008 +0100 wined3d: Destroy FBOs and reset pointers on Reset. --- dlls/wined3d/device.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 640a5e2..a2509a7 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6799,6 +6799,35 @@ static HRESULT WINAPI reset_unload_resources(IWineD3DResource *resource, void *d return S_OK; } +static void reset_fbo_state(IWineD3DDevice *iface) { + IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; + unsigned int i; + + ENTER_GL(); + GL_EXTCALL(glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)); + checkGLcall("glBindFramebufferEXT(GL_FRAMEBUFFER_EXT, 0)"); + + if (This->fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->fbo)); + This->fbo = 0; + } + if (This->src_fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->src_fbo)); + This->src_fbo = 0; + } + if (This->dst_fbo) { + GL_EXTCALL(glDeleteFramebuffersEXT(1, &This->dst_fbo)); + This->dst_fbo = 0; + } + checkGLcall("Tear down fbos\n"); + LEAVE_GL(); + + for (i = 0; i < GL_LIMITS(buffers); ++i) { + This->fbo_color_attachments[i] = NULL; + } + This->fbo_depth_attachment = NULL; +} + static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRESENT_PARAMETERS* pPresentationParameters) { IWineD3DDeviceImpl *This = (IWineD3DDeviceImpl *) iface; IWineD3DSwapChainImpl *swapchain; @@ -6859,6 +6888,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE ERR("What do do about a changed auto depth stencil parameter?\n"); } + if (wined3d_settings.offscreen_rendering_mode == ORM_FBO) { + reset_fbo_state((IWineD3DDevice *) This); + } + IWineD3DDevice_EnumResources(iface, reset_unload_resources, NULL); LIST_FOR_EACH_ENTRY(shader, &This->shaders, IWineD3DBaseShaderImpl, baseShader.shader_list_entry) { This->shader_backend->shader_destroy((IWineD3DBaseShader *) shader);

1 0

Stefan Dösinger : wined3d: Unload implicit depth stencil buffers correctly.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 33d012efcbb601e5ba95e2ed94e3fd3cfd62c6d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33d012efcbb601e5ba95e2ed9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:10:14 2008 +0100 wined3d: Unload implicit depth stencil buffers correctly. We have to destroy potential fbo renderbuffers, and make sure the texture is gone --- dlls/wined3d/surface.c | 36 +++++++++++++++++++++++++++--------- 1 files changed, 27 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cfb47ca..44507e7 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -510,25 +510,43 @@ static void surface_remove_pbo(IWineD3DSurfaceImpl *This) { static void WINAPI IWineD3DSurfaceImpl_UnLoad(IWineD3DSurface *iface) { IWineD3DBaseTexture *texture = NULL; IWineD3DSurfaceImpl *This = (IWineD3DSurfaceImpl *) iface; + renderbuffer_entry_t *entry, *entry2; TRACE("(%p)\n", iface); - /* Default pool resources are supposed to be destroyed before Reset is called. - * Implicit resources stay however. So this means we have an implicit render target - * or depth stencil, and the content isn't supposed to survive the reset anyway - */ if(This->resource.pool == WINED3DPOOL_DEFAULT) { - TRACE("Default pool - nothing to do\n"); - return; + /* Default pool resources are supposed to be destroyed before Reset is called. + * Implicit resources stay however. So this means we have an implicit render target + * or depth stencil. The content may be destroyed, but we still have to tear down + * opengl resources, so we cannot leave early. + */ + IWineD3DSurface_ModifyLocation(iface, SFLAG_INSYSMEM, TRUE); + } else { + /* Load the surface into system memory */ + IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); } - - /* Load the surface into system memory */ - IWineD3DSurface_LoadLocation(iface, SFLAG_INSYSMEM, NULL); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INTEXTURE, FALSE); + IWineD3DSurface_ModifyLocation(iface, SFLAG_INDRAWABLE, FALSE); + This->Flags &= ~SFLAG_ALLOCATED; /* Destroy PBOs, but load them into real sysmem before */ if(This->Flags & SFLAG_PBO) { surface_remove_pbo(This); } + /* Destroy fbo render buffers. This is needed for implicit render targets, for + * all application-created targets the application has to release the surface + * before calling _Reset + */ + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &This->renderbuffers, renderbuffer_entry_t, entry) { + ENTER_GL(); + GL_EXTCALL(glDeleteRenderbuffersEXT(1, &entry->id)); + LEAVE_GL(); + list_remove(&entry->entry); + HeapFree(GetProcessHeap(), 0, entry); + } + list_init(&This->renderbuffers); + This->current_renderbuffer = NULL; + /* If we're in a texture, the texture name belongs to the texture. Otherwise, * destroy it */

1 0

Stefan Dösinger : wined3d: Update the auto depth stencil buffer size on reset.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: c1538f8048f08a70d15b1365eb1dfb37bb6b626c URL: http://source.winehq.org/git/wine.git/?a=commit;h=c1538f8048f08a70d15b1365e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:04:05 2008 +0100 wined3d: Update the auto depth stencil buffer size on reset. --- dlls/wined3d/device.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4426d94..640a5e2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6901,6 +6901,10 @@ static HRESULT WINAPI IWineD3DDeviceImpl_Reset(IWineD3DDevice* iface, WINED3DPRE for(i = 0; i < swapchain->presentParms.BackBufferCount; i++) { updateSurfaceDesc((IWineD3DSurfaceImpl *)swapchain->backBuffer[i], pPresentationParameters); } + if(This->auto_depth_stencil_buffer) { + updateSurfaceDesc((IWineD3DSurfaceImpl *)This->auto_depth_stencil_buffer, pPresentationParameters); + } + /* Now set the new viewport */ IWineD3DDevice_SetViewport(iface, &vp);

1 0

Stefan Dösinger : wined3d: Beware of texture_rectangle NP2 support in Reset.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: b706a62aff4356fc35c00c3c6ff601323c8bdc4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b706a62aff4356fc35c00c3c6… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Fri Jan 25 18:02:29 2008 +0100 wined3d: Beware of texture_rectangle NP2 support in Reset. --- dlls/wined3d/device.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 742734c..4426d94 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -6766,7 +6766,7 @@ static void updateSurfaceDesc(IWineD3DSurfaceImpl *surface, WINED3DPRESENT_PARAM } surface->currentDesc.Width = pPresentationParameters->BackBufferWidth; surface->currentDesc.Height = pPresentationParameters->BackBufferHeight; - if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO)) { + if (GL_SUPPORT(ARB_TEXTURE_NON_POWER_OF_TWO) || GL_SUPPORT(ARB_TEXTURE_RECTANGLE)) { surface->pow2Width = pPresentationParameters->BackBufferWidth; surface->pow2Height = pPresentationParameters->BackBufferHeight; } else {

1 0

James Hawkins : msi: Fix handling of the NULL separator when writing registry values.
by Alexandre Julliard Feb. 5, 2008

Feb. 5, 2008

Module: wine Branch: master Commit: 2f658cb337871cde2d05849fbc3f5408f4ce799e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f658cb337871cde2d05849fb… Author: James Hawkins <truiken(a)gmail.com> Date: Mon Feb 4 19:06:53 2008 -0600 msi: Fix handling of the NULL separator when writing registry values. --- dlls/msi/action.c | 24 ++++++++++++++++++ dlls/msi/tests/install.c | 61 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 85 insertions(+), 0 deletions(-) diff --git a/dlls/msi/action.c b/dlls/msi/action.c index 5b940c6..2efcbbb 100644 --- a/dlls/msi/action.c +++ b/dlls/msi/action.c @@ -2240,6 +2240,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, DWORD *size) { LPSTR data = NULL; + if (value[0]=='#' && value[1]!='#' && value[1]!='%') { if (value[1]=='x') @@ -2321,6 +2322,7 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, { static const WCHAR szMulti[] = {'[','~',']',0}; LPCWSTR ptr; + LPWSTR newdata; *type=REG_SZ; if (value[0]=='#') @@ -2339,7 +2341,29 @@ static LPSTR parse_value(MSIPACKAGE *package, LPCWSTR value, DWORD *type, if (strstrW(value,szMulti)) *type = REG_MULTI_SZ; + /* remove initial delimiter */ + if (!strncmpW(value, szMulti, 3)) + ptr = value + 3; + *size = deformat_string(package, ptr,(LPWSTR*)&data); + + /* add double NULL terminator */ + if (*type == REG_MULTI_SZ) + { + *size += sizeof(WCHAR); + newdata = msi_alloc(*size); + if (!newdata) + { + msi_free(data); + return NULL; + } + + memcpy(newdata, data, *size - 1); + newdata[*size] = '\0'; + + msi_free(data); + data = (LPSTR)newdata; + } } return data; } diff --git a/dlls/msi/tests/install.c b/dlls/msi/tests/install.c index d394908..b5892c0 100644 --- a/dlls/msi/tests/install.c +++ b/dlls/msi/tests/install.c @@ -576,6 +576,16 @@ static const CHAR df_duplicate_file_dat[] = "FileKey\tComponent_\tFile_\tDestNam "maximus\tmaximus\tmaximus\taugustus\t\n" "caesar\tmaximus\tmaximus\t\tNONEXISTENT\n"; +static const CHAR wrv_component_dat[] = "Component\tComponentId\tDirectory_\tAttributes\tCondition\tKeyPath\n" + "s72\tS38\ts72\ti2\tS255\tS72\n" + "Component\tComponent\n" + "augustus\t\tMSITESTDIR\t0\t\taugustus\n"; + +static const CHAR wrv_registry_dat[] = "Registry\tRoot\tKey\tName\tValue\tComponent_\n" + "s72\ti2\tl255\tL255\tL0\ts72\n" + "Registry\tRegistry\n" + "regdata\t2\tSOFTWARE\\Wine\\msitest\tValue\t[~]one[~]two[~]three\taugustus"; + typedef struct _msi_table { const CHAR *filename; @@ -864,6 +874,19 @@ static const msi_table df_tables[] = ADD_TABLE(df_duplicate_file), }; +static const msi_table wrv_tables[] = +{ + ADD_TABLE(wrv_component), + ADD_TABLE(directory), + ADD_TABLE(rof_feature), + ADD_TABLE(ci2_feature_comp), + ADD_TABLE(ci2_file), + ADD_TABLE(install_exec_seq), + ADD_TABLE(rof_media), + ADD_TABLE(property), + ADD_TABLE(wrv_registry), +}; + /* cabinet definitions */ /* make the max size large so there is only one cab file */ @@ -3625,6 +3648,43 @@ static void test_duplicatefiles(void) DeleteFile(msifile); } +static void test_writeregistryvalues(void) +{ + UINT r; + LONG res; + HKEY hkey; + DWORD type, size; + CHAR path[MAX_PATH]; + + CreateDirectoryA("msitest", NULL); + create_file("msitest\\augustus", 500); + + create_database(msifile, wrv_tables, sizeof(wrv_tables) / sizeof(msi_table)); + + MsiSetInternalUI(INSTALLUILEVEL_NONE, NULL); + + r = MsiInstallProductA(msifile, NULL); + ok(r == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %u\n", r); + ok(delete_pf("msitest\\augustus", TRUE), "File installed\n"); + ok(delete_pf("msitest", FALSE), "File installed\n"); + + res = RegOpenKey(HKEY_LOCAL_MACHINE, "SOFTWARE\\Wine\\msitest", &hkey); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + + size = MAX_PATH; + type = REG_MULTI_SZ; + memset(path, 'a', MAX_PATH); + res = RegQueryValueExA(hkey, "Value", NULL, &type, (LPBYTE)path, &size); + ok(res == ERROR_SUCCESS, "Expected ERROR_SUCCESS, got %d\n", res); + ok(!memcmp(path, "one\0two\0three\0\0", size), "Wrong multi-sz data\n"); + ok(size == 15, "Expected 15, got %d\n", size); + ok(type == REG_MULTI_SZ, "Expected REG_MULTI_SZ, got %d\n", type); + + DeleteFile(msifile); + DeleteFile("msitest\\augustus"); + RemoveDirectory("msitest"); +} + START_TEST(install) { DWORD len; @@ -3667,6 +3727,7 @@ START_TEST(install) test_movefiles(); test_missingcab(); test_duplicatefiles(); + test_writeregistryvalues(); SetCurrentDirectoryA(prev_path); }

1 0