January 2012 - Wine-commits

Matteo Bruni : wined3d: Don't try to remove the location flag if it' s not there in the first place.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: e4c0d6abbea9891aa60312e02f55b0081875fe0d URL: http://source.winehq.org/git/wine.git/?a=commit;h=e4c0d6abbea9891aa60312e02… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:43 2012 +0100 wined3d: Don't try to remove the location flag if it's not there in the first place. --- dlls/wined3d/surface.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4a49048..8d5dd1b 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2041,8 +2041,10 @@ void surface_set_texture_name(struct wined3d_surface *surface, GLuint new_name, /* FIXME: We shouldn't need to remove SFLAG_INTEXTURE if the * surface has no texture name yet. See if we can get rid of this. */ if (surface->flags & flag) + { ERR("Surface has %s set, but no texture name.\n", debug_surflocation(flag)); - surface_modify_location(surface, flag, FALSE); + surface_modify_location(surface, flag, FALSE); + } } *name = new_name;

1 0

Matteo Bruni : wined3d: Don't use separate location flags for depth buffers .
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 1c14c0d2fcdd8385c4e2c2bac851cb9d3bf933a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c14c0d2fcdd8385c4e2c2bac… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:44 2012 +0100 wined3d: Don't use separate location flags for depth buffers. --- dlls/wined3d/device.c | 13 ++++++++----- dlls/wined3d/drawprim.c | 5 ++--- dlls/wined3d/surface.c | 23 +++++++++++++++-------- dlls/wined3d/wined3d_private.h | 9 ++++----- 4 files changed, 29 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 8e7bd19..c01d53c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -571,8 +571,9 @@ void device_switch_onscreen_ds(struct wined3d_device *device, { if (device->onscreen_depth_stencil) { - surface_load_ds_location(device->onscreen_depth_stencil, context, SFLAG_DS_OFFSCREEN); - surface_modify_ds_location(device->onscreen_depth_stencil, SFLAG_DS_OFFSCREEN, + surface_load_ds_location(device->onscreen_depth_stencil, context, SFLAG_INTEXTURE); + + surface_modify_ds_location(device->onscreen_depth_stencil, SFLAG_INTEXTURE, device->onscreen_depth_stencil->ds_current_size.cx, device->onscreen_depth_stencil->ds_current_size.cy); wined3d_surface_decref(device->onscreen_depth_stencil); @@ -696,9 +697,9 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (flags & WINED3DCLEAR_ZBUFFER) { - DWORD location = render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; - if (location == SFLAG_DS_ONSCREEN && fb->depth_stencil != device->onscreen_depth_stencil) + if (!render_offscreen && fb->depth_stencil != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, fb->depth_stencil); prepare_ds_clear(fb->depth_stencil, context, location, draw_rect, rect_count, clear_rect); } @@ -729,7 +730,9 @@ HRESULT device_clear_render_targets(struct wined3d_device *device, UINT rt_count if (flags & WINED3DCLEAR_ZBUFFER) { - surface_modify_location(fb->depth_stencil, fb->depth_stencil->draw_binding, TRUE); + DWORD location = render_offscreen ? fb->depth_stencil->draw_binding : SFLAG_INDRAWABLE; + + surface_modify_location(fb->depth_stencil, location, TRUE); glDepthMask(GL_TRUE); context_invalidate_state(context, STATE_RENDER(WINED3D_RS_ZWRITEENABLE)); diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index b63d48e..61fbb85 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -615,13 +615,13 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId * Z-compare function into account, but we could skip loading the * depthstencil for D3DCMP_NEVER and D3DCMP_ALWAYS as well. Also note * that we never copy the stencil data.*/ - DWORD location = context->render_offscreen ? SFLAG_DS_OFFSCREEN : SFLAG_DS_ONSCREEN; + DWORD location = context->render_offscreen ? device->fb.depth_stencil->draw_binding : SFLAG_INDRAWABLE; if (state->render_states[WINED3D_RS_ZWRITEENABLE] || state->render_states[WINED3D_RS_ZENABLE]) { struct wined3d_surface *ds = device->fb.depth_stencil; RECT current_rect, draw_rect, r; - if (location == SFLAG_DS_ONSCREEN && ds != device->onscreen_depth_stencil) + if (!context->render_offscreen && ds != device->onscreen_depth_stencil) device_switch_onscreen_ds(device, context, ds); if (ds->flags & location) @@ -638,7 +638,6 @@ void drawPrimitive(struct wined3d_device *device, UINT index_count, UINT StartId if (state->render_states[WINED3D_RS_ZWRITEENABLE]) { surface_modify_ds_location(ds, location, ds->ds_current_size.cx, ds->ds_current_size.cy); - surface_modify_location(ds, ds->draw_binding, TRUE); } } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8d5dd1b..1ff5521 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1395,9 +1395,8 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); - surface_modify_ds_location(dst_surface, SFLAG_DS_OFFSCREEN, + surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); - surface_modify_location(dst_surface, SFLAG_INTEXTURE, TRUE); return WINED3D_OK; } @@ -5557,12 +5556,19 @@ void surface_modify_ds_location(struct wined3d_surface *surface, { TRACE("surface %p, new location %#x, w %u, h %u.\n", surface, location, w, h); - if (location & ~SFLAG_DS_LOCATIONS) + if (location & ~SFLAG_LOCATIONS) FIXME("Invalid location (%#x) specified.\n", location); + if (!(surface->flags & SFLAG_ALLOCATED)) + location &= ~SFLAG_INTEXTURE; + if (!(surface->rb_resolved)) + location &= ~SFLAG_INRB_RESOLVED; + if (!(surface->rb_multisample)) + location &= ~SFLAG_INRB_MULTISAMPLE; + surface->ds_current_size.cx = w; surface->ds_current_size.cy = h; - surface->flags &= ~SFLAG_DS_LOCATIONS; + surface->flags &= ~SFLAG_LOCATIONS; surface->flags |= location; } @@ -5603,7 +5609,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } - if (!(surface->flags & SFLAG_DS_LOCATIONS)) + if (!(surface->flags & SFLAG_LOCATIONS)) { /* This mostly happens when a depth / stencil is used without being * cleared first. In principle we could upload from sysmem, or @@ -5617,7 +5623,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co return; } - if (location == SFLAG_DS_OFFSCREEN) + if (location == SFLAG_INTEXTURE) { GLint old_binding = 0; GLenum bind_target; @@ -5684,7 +5690,7 @@ void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_co if (wined3d_settings.strict_draw_ordering) wglFlush(); /* Flush to ensure ordering across contexts. */ } - else if (location == SFLAG_DS_ONSCREEN) + else if (location == SFLAG_INDRAWABLE) { TRACE("Copying depth texture to onscreen depth buffer.\n"); @@ -5721,6 +5727,7 @@ void surface_modify_location(struct wined3d_surface *surface, DWORD location, BO surface, debug_surflocation(location), persistent); if (wined3d_settings.offscreen_rendering_mode == ORM_FBO && surface_is_offscreen(surface) + && !(surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (location & SFLAG_INDRAWABLE)) ERR("Trying to invalidate the SFLAG_INDRAWABLE location of an offscreen surface.\n"); @@ -6112,7 +6119,7 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (location == SFLAG_INTEXTURE) { struct wined3d_context *context = context_acquire(device, NULL); - surface_load_ds_location(surface, context, SFLAG_DS_OFFSCREEN); + surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 114e706..e9c6233 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2153,8 +2153,6 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D #define SFLAG_INDRAWABLE 0x00100000 /* The GL drawable is current. */ #define SFLAG_INRB_MULTISAMPLE 0x00200000 /* The multisample renderbuffer is current. */ #define SFLAG_INRB_RESOLVED 0x00400000 /* The resolved renderbuffer is current. */ -#define SFLAG_DS_ONSCREEN 0x00800000 /* This is a depth / stencil surface, last modified onscreen. */ -#define SFLAG_DS_OFFSCREEN 0x01000000 /* This is a depth / stencil surface, last modified offscreen. */ #define SFLAG_PIN_SYSMEM 0x02000000 /* Keep the surface in sysmem, at the same address. */ /* In some conditions the surface memory must not be freed: @@ -2181,9 +2179,10 @@ void flip_surface(struct wined3d_surface *front, struct wined3d_surface *back) D SFLAG_INRB_MULTISAMPLE | \ SFLAG_INRB_RESOLVED) -#define SFLAG_DS_LOCATIONS (SFLAG_DS_ONSCREEN | \ - SFLAG_DS_OFFSCREEN) -#define SFLAG_DS_DISCARDED SFLAG_DS_LOCATIONS +#define SFLAG_DS_DISCARDED (SFLAG_INTEXTURE | \ + SFLAG_INDRAWABLE | \ + SFLAG_INRB_MULTISAMPLE | \ + SFLAG_INRB_RESOLVED) typedef enum { NO_CONVERSION,

1 0

Matteo Bruni : d3d9/tests: Add more INTZ tests.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 53849b7d5e1f2da51fe839878f431971b465992c URL: http://source.winehq.org/git/wine.git/?a=commit;h=53849b7d5e1f2da51fe839878… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:45 2012 +0100 d3d9/tests: Add more INTZ tests. --- dlls/d3d9/tests/visual.c | 141 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 139 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e3f683f..e92ee0d 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -11537,6 +11537,20 @@ static void intz_test(IDirect3DDevice9 *device) { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, + }, + half_quad_1[] = + { + { -1.0f, 0.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 0.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, -1.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, + }, + half_quad_2[] = + { + { -1.0f, 1.0f, 0.0f, 0.0f, 1.0f, 1.0f, 0.5f}, + { 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 0.5f}, + { -1.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.5f}, + { 1.0f, 0.0f, 1.0f, 1.0f, 0.0f, 0.0f, 0.5f}, }; struct { @@ -11571,6 +11585,11 @@ static void intz_test(IDirect3DDevice9 *device) skip("No pixel shader 2.0 support, skipping INTZ test.\n"); return; } + if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + { + skip("No unconditional NP2 texture support, skipping INTZ test.\n"); + return; + } hr = IDirect3DDevice9_GetDirect3D(device, &d3d9); ok(SUCCEEDED(hr), "GetDirect3D failed, hr %#x.\n", hr); @@ -11590,10 +11609,10 @@ static void intz_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetDepthStencilSurface(device, &original_ds); ok(SUCCEEDED(hr), "GetDepthStencilSurface failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateTexture(device, 1024, 1024, 1, + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); ok(SUCCEEDED(hr), "CreateTexture failed, hr %#x.\n", hr); - hr = IDirect3DDevice9_CreateRenderTarget(device, 1024, 1024, D3DFMT_A8R8G8B8, + hr = IDirect3DDevice9_CreateRenderTarget(device, 640, 480, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_NONE, 0, FALSE, &rt, NULL); ok(SUCCEEDED(hr), "CreateRenderTarget failed, hr %#x.\n", hr); hr = IDirect3DDevice9_CreatePixelShader(device, ps_code, &ps); @@ -11621,6 +11640,7 @@ static void intz_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MIPFILTER, D3DTEXF_POINT); ok(SUCCEEDED(hr), "SetSamplerState failed, hr %#x.\n", hr); + /* Render offscreen, using the INTZ texture as depth buffer */ hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &ds); ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); @@ -11670,6 +11690,123 @@ static void intz_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + /* Render onscreen while using the INTZ texture as depth buffer */ + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, + D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &ds); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Setup the depth/stencil surface. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Read the depth values back. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetTexture(device, 0, NULL); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + IDirect3DTexture9_Release(texture); + + /* Render offscreen, then onscreen, and finally check the INTZ texture in both areas */ + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, + D3DUSAGE_DEPTHSTENCIL, MAKEFOURCC('I','N','T','Z'), D3DPOOL_DEFAULT, &texture, NULL); + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &ds); + ok(SUCCEEDED(hr), "GetSurfaceLevel failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, ds); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetRenderTarget(device, 0, rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, NULL); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Setup the depth/stencil surface. */ + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); + ok(SUCCEEDED(hr), "Clear failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, half_quad_1, sizeof(*half_quad_1)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetRenderTarget(device, 0, original_rt); + ok(SUCCEEDED(hr), "SetRenderTarget failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, half_quad_2, sizeof(*half_quad_2)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + hr = IDirect3DDevice9_SetDepthStencilSurface(device, NULL); + ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); + IDirect3DSurface9_Release(ds); + hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); + ok(SUCCEEDED(hr), "SetTexture failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetPixelShader(device, ps); + ok(SUCCEEDED(hr), "SetPixelShader failed, hr %#x.\n", hr); + + /* Read the depth values back. */ + hr = IDirect3DDevice9_BeginScene(device); + ok(SUCCEEDED(hr), "BeginScene failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_DrawPrimitiveUP(device, D3DPT_TRIANGLESTRIP, 2, quad, sizeof(*quad)); + ok(SUCCEEDED(hr), "DrawPrimitiveUP failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_EndScene(device); + ok(SUCCEEDED(hr), "EndScene failed, hr %#x.\n", hr); + + for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) + { + D3DCOLOR color = getPixelColor(device, expected_colors[i].x, expected_colors[i].y); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + } + + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Present failed, hr %#x.\n", hr); + hr = IDirect3DDevice9_SetDepthStencilSurface(device, original_ds); ok(SUCCEEDED(hr), "SetDepthStencilSurface failed, hr %#x.\n", hr); IDirect3DSurface9_Release(original_ds);

1 0

Matteo Bruni : d3d9/tests: Fix NP2 check.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 175a6d8d59a8a68e85aed876299ec18f514c2fb9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=175a6d8d59a8a68e85aed8762… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:46 2012 +0100 d3d9/tests: Fix NP2 check. --- dlls/d3d9/tests/visual.c | 18 ++++++++++++------ 1 files changed, 12 insertions(+), 6 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index e92ee0d..ccbbbeb 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -7884,16 +7884,22 @@ static void conditional_np2_repeat_test(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetDeviceCaps(device, &caps); ok(hr == D3D_OK, "IDirect3DDevice9_GetDeviceCaps failed hr=%08x\n", hr); - if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + if (caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) + { /* NP2 conditional requires the POW2 flag. Check that while we're at it */ - ok((caps.TextureCaps & D3DPTEXTURECAPS_NONPOW2CONDITIONAL) == 0, - "Card has conditional NP2 support without power of two restriction set\n"); - skip("Card has unconditional pow2 support, skipping conditional NP2 tests\n"); - return; - } else if(!(caps.TextureCaps & D3DPTEXTURECAPS_POW2)) { + ok(caps.TextureCaps & D3DPTEXTURECAPS_POW2, + "Card has conditional NP2 support without power of two restriction set\n"); + } + else if (caps.TextureCaps & D3DPTEXTURECAPS_POW2) + { skip("No conditional NP2 support, skipping conditional NP2 tests\n"); return; } + else + { + skip("Card has unconditional NP2 support, skipping conditional NP2 tests\n"); + return; + } hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff000000, 0.0, 0); ok(hr == D3D_OK, "IDirect3DDevice9_Clear failed, hr=%08x\n", hr);

1 0

Matteo Bruni : d3d9/tests: Multisampled depth buffer tests.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 9fb3e0fb62d5769e1f09b5d82f1192723bf1d39f URL: http://source.winehq.org/git/wine.git/?a=commit;h=9fb3e0fb62d5769e1f09b5d82… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Jan 9 15:52:47 2012 +0100 d3d9/tests: Multisampled depth buffer tests. --- dlls/d3d9/tests/visual.c | 253 +++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 241 insertions(+), 12 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9fb3e0fb62d5769e1f09b…

1 0

Andrew Eikum : wineoss.drv: Fix IAudioRenderClient::{Get, Release}Buffer protocol.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 139e31bc002e73bbb2e34268cae9e0918aaa4fef URL: http://source.winehq.org/git/wine.git/?a=commit;h=139e31bc002e73bbb2e34268c… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:25:32 2012 -0600 wineoss.drv: Fix IAudioRenderClient::{Get,Release}Buffer protocol. --- dlls/wineoss.drv/mmdevdrv.c | 38 +++++++++++++++++++++++++------------- 1 files changed, 25 insertions(+), 13 deletions(-) diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index bc4d952..aaa94ee 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -128,6 +128,7 @@ struct ACImpl { BYTE *local_buffer, *tmp_buffer; int buf_state; + long getbuf_last; /* <0 when using tmp_buffer */ HANDLE timer; CRITICAL_SECTION lock; @@ -1495,7 +1496,7 @@ static HRESULT WINAPI AudioClient_Reset(IAudioClient *iface) return AUDCLNT_E_NOT_STOPPED; } - if(This->buf_state != NOT_LOCKED){ + if(This->buf_state != NOT_LOCKED || This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_BUFFER_OPERATION_PENDING; } @@ -1689,15 +1690,16 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, if(!data) return E_POINTER; + *data = NULL; + EnterCriticalSection(&This->lock); - if(This->buf_state != NOT_LOCKED){ + if(This->getbuf_last){ LeaveCriticalSection(&This->lock); return AUDCLNT_E_OUT_OF_ORDER; } if(!frames){ - This->buf_state = LOCKED_NORMAL; LeaveCriticalSection(&This->lock); return S_OK; } @@ -1727,10 +1729,10 @@ static HRESULT WINAPI AudioRenderClient_GetBuffer(IAudioRenderClient *iface, This->tmp_buffer_frames = frames; } *data = This->tmp_buffer; - This->buf_state = LOCKED_WRAPPED; + This->getbuf_last = -frames; }else{ *data = This->local_buffer + write_pos * This->fmt->nBlockAlign; - This->buf_state = LOCKED_NORMAL; + This->getbuf_last = frames; } LeaveCriticalSection(&This->lock); @@ -1766,13 +1768,23 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( EnterCriticalSection(&This->lock); - if(This->buf_state == NOT_LOCKED || !written_frames){ - This->buf_state = NOT_LOCKED; + if(!written_frames){ + This->getbuf_last = 0; + LeaveCriticalSection(&This->lock); + return S_OK; + } + + if(!This->getbuf_last){ + LeaveCriticalSection(&This->lock); + return AUDCLNT_E_OUT_OF_ORDER; + } + + if(written_frames > (This->getbuf_last >= 0 ? This->getbuf_last : -This->getbuf_last)){ LeaveCriticalSection(&This->lock); - return written_frames ? AUDCLNT_E_OUT_OF_ORDER : S_OK; + return AUDCLNT_E_INVALID_SIZE; } - if(This->buf_state == LOCKED_NORMAL) + if(This->getbuf_last >= 0) buffer = This->local_buffer + This->fmt->nBlockAlign * ((This->lcl_offs_frames + This->held_frames) % This->bufsize_frames); else @@ -1782,7 +1794,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( oss_silence_buffer(This, buffer, written_frames); if(This->held_frames){ - if(This->buf_state == LOCKED_WRAPPED) + if(This->getbuf_last < 0) oss_wrap_buffer(This, buffer, written_frames); This->held_frames += written_frames; @@ -1797,7 +1809,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( written_frames * This->fmt->nBlockAlign); if(w_bytes < 0){ if(errno != EAGAIN){ - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock); ERR("write failed: %d (%s)\n", errno, strerror(errno)); return E_FAIL; @@ -1808,7 +1820,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( This->inbuf_frames += w_frames; if(w_frames < written_frames){ - if(This->buf_state == LOCKED_WRAPPED) + if(This->getbuf_last < 0) oss_wrap_buffer(This, This->tmp_buffer + w_bytes, written_frames - w_frames); else @@ -1818,7 +1830,7 @@ static HRESULT WINAPI AudioRenderClient_ReleaseBuffer( } This->written_frames += written_frames; - This->buf_state = NOT_LOCKED; + This->getbuf_last = 0; LeaveCriticalSection(&This->lock);

1 0

Jörg Höhle : mmdevapi: Round buffer size like native in shared mode.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: fcc9b74cb2c3d6433c20527b4c8b487fdd5cd6f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcc9b74cb2c3d6433c20527b4… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Thu Jan 5 18:56:46 2012 +0100 mmdevapi: Round buffer size like native in shared mode. --- dlls/winecoreaudio.drv/mmdevdrv.c | 2 +- dlls/wineoss.drv/mmdevdrv.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/winecoreaudio.drv/mmdevdrv.c b/dlls/winecoreaudio.drv/mmdevdrv.c index 93ff3d6..19a505c 100644 --- a/dlls/winecoreaudio.drv/mmdevdrv.c +++ b/dlls/winecoreaudio.drv/mmdevdrv.c @@ -1006,7 +1006,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_ms = period / 10000; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); if(This->dataflow == eCapture){ int i; diff --git a/dlls/wineoss.drv/mmdevdrv.c b/dlls/wineoss.drv/mmdevdrv.c index 15bda6a..bc4d952 100644 --- a/dlls/wineoss.drv/mmdevdrv.c +++ b/dlls/wineoss.drv/mmdevdrv.c @@ -956,7 +956,7 @@ static HRESULT WINAPI AudioClient_Initialize(IAudioClient *iface, This->period_us = period / 10; - This->bufsize_frames = ceil(fmt->nSamplesPerSec * (duration / 10000000.)); + This->bufsize_frames = MulDiv(duration, fmt->nSamplesPerSec, 10000000); This->local_buffer = HeapAlloc(GetProcessHeap(), 0, This->bufsize_frames * fmt->nBlockAlign); if(!This->local_buffer){

1 0

André Hentschel : po: Update German translation.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 4777a1c1c97e90765610e6eb7840c68f11ff7482 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4777a1c1c97e90765610e6eb7… Author: André Hentschel <nerv(a)dawncrow.de> Date: Sun Jan 8 16:11:22 2012 +0100 po: Update German translation. --- po/de.po | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/po/de.po b/po/de.po index e962a22..47813e9 100644 --- a/po/de.po +++ b/po/de.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2012-01-05 19:30+0100\n" +"PO-Revision-Date: 2012-01-08 16:10+0100\n" "Last-Translator: André Hentschel\n" "Language-Team: none\n" "Language: German\n" @@ -1301,7 +1301,7 @@ msgstr "CPS" #: crypt32.rc:54 cryptdlg.rc:32 msgid "User Notice" -msgstr "Benutzerbenachrichtung" +msgstr "Benutzerbenachrichtigung" #: crypt32.rc:55 msgid "On-line Certificate Status Protocol" @@ -8771,7 +8771,7 @@ msgid "" "Cannot carry out the specified command on an auto-opened device. Wait until " "the device is closed, and then try again." msgstr "" -"Der Befehl kann nicht auf ein selbst öffnedes Gerät angewandt werden. Warten " +"Der Befehl kann nicht auf ein selbst öffnendes Gerät angewandt werden. Warten " "Sie, bis das Gerät geschlossen wurde und versuchen Sie es erneut." #: winmm.rc:99 @@ -13126,9 +13126,8 @@ msgid "&Color" msgstr "F&arbe" #: wineconsole.rc:97 -#, fuzzy msgid "Configuration" -msgstr " Konfiguration " +msgstr "Konfiguration" #: wineconsole.rc:100 msgid "Buffer zone"

1 0

Alexandre Julliard : gdi32/tests: Remove device capabilities test that fails on XP.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 62eaaa796b43aee366c47f00c8f9c6b229d95cb4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=62eaaa796b43aee366c47f00c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:27:41 2012 +0100 gdi32/tests: Remove device capabilities test that fails on XP. --- dlls/gdi32/tests/dc.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/gdi32/tests/dc.c b/dlls/gdi32/tests/dc.c index 922907a..25d6982 100644 --- a/dlls/gdi32/tests/dc.c +++ b/dlls/gdi32/tests/dc.c @@ -284,7 +284,7 @@ static void test_device_caps( HDC hdc, HDC ref_dc, const char *descr ) CURVECAPS, LINECAPS, POLYGONALCAPS, - TEXTCAPS, + /* TEXTCAPS broken on printer DC on winxp */ CLIPCAPS, RASTERCAPS, ASPECTX,

1 0

Alexandre Julliard : user32/tests: Fix some test failures on Windows.
by Alexandre Julliard 09 Jan '12

09 Jan '12

Module: wine Branch: master Commit: 0702d31c81b2cd9267d68b003670a6fe2791386e URL: http://source.winehq.org/git/wine.git/?a=commit;h=0702d31c81b2cd9267d68b003… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Jan 9 16:40:28 2012 +0100 user32/tests: Fix some test failures on Windows. --- dlls/user32/tests/msg.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c index 6f40a0b..42f4c4f 100644 --- a/dlls/user32/tests/msg.c +++ b/dlls/user32/tests/msg.c @@ -13497,7 +13497,7 @@ static const struct message WmSetFocus_1[] = { { WM_QUERYNEWPALETTE, sent|wparam|lparam|parent|optional, 0, 0 }, { WM_WINDOWPOSCHANGING, sent|parent, 0, SWP_NOSIZE|SWP_NOMOVE }, { WM_ACTIVATEAPP, sent|wparam|parent, 1 }, - { WM_NCACTIVATE, sent|wparam|parent, 1 }, + { WM_NCACTIVATE, sent|parent }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_GETTEXT, sent|defwinproc|parent|optional }, { WM_ACTIVATE, sent|wparam|parent, 1 }, @@ -13573,7 +13573,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_focus = SetFocus((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetFocus on an invalid window", FALSE); ok(old_focus == 0, "expected old focus 0, got %p\n", old_focus); @@ -13602,7 +13603,8 @@ static void test_SetFocus(void) SetLastError(0xdeadbeef); old_active = SetActiveWindow((HWND)0xdeadbeef); - ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE, "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); + ok(GetLastError() == ERROR_INVALID_WINDOW_HANDLE || broken(GetLastError() == 0xdeadbeef), + "expected ERROR_INVALID_WINDOW_HANDLE, got %d\n", GetLastError()); while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ok_sequence(WmEmptySeq, "SetActiveWindow on an invalid window", FALSE); ok(old_active == 0, "expected old focus 0, got %p\n", old_active);

1 0