wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Akihiro Sagawa : po: Update Japanese translation.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 71d5e48a0c769edd52531e1884cb0b767034906a URL: http://source.winehq.org/git/wine.git/?a=commit;h=71d5e48a0c769edd52531e188… Author: Akihiro Sagawa <sagawa.aki(a)gmail.com> Date: Mon Jan 9 17:24:41 2012 +0900 po: Update Japanese translation. --- po/ja.po | 251 +++++++++++++++++++++++++------------------------------------- 1 files changed, 101 insertions(+), 150 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=71d5e48a0c769edd52531…

1 0

Lucas Fialho Zawacki : dinput: Added DI_SETTINGSNOTSAVED flag.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: 20930b01fddfa6edb54466fc8f6973de2014da3f URL: http://source.winehq.org/git/wine.git/?a=commit;h=20930b01fddfa6edb54466fc8… Author: Lucas Fialho Zawacki <lfzawacki(a)gmail.com> Date: Mon Jan 9 22:04:15 2012 -0200 dinput: Added DI_SETTINGSNOTSAVED flag. --- include/dinput.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/dinput.h b/include/dinput.h index 353ec55..a6cf7e2 100644 --- a/include/dinput.h +++ b/include/dinput.h @@ -134,6 +134,7 @@ DECL_WINELIB_TYPE_AW(LPDIRECTINPUTDEVICE8) #define DI_DOWNLOADSKIPPED ((HRESULT)0x00000003) #define DI_EFFECTRESTARTED ((HRESULT)0x00000004) #define DI_TRUNCATED ((HRESULT)0x00000008) +#define DI_SETTINGSNOTSAVED ((HRESULT)0x0000000B) #define DI_TRUNCATEDANDRESTARTED ((HRESULT)0x0000000C) #define DIERR_OLDDIRECTINPUTVERSION \

1 0

Andrew Eikum : itss: Use case-insensitive strcmp.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: f71efc297bb50e55e2c2793d0320db18e9e373a5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f71efc297bb50e55e2c2793d0… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:28:31 2012 -0600 itss: Use case-insensitive strcmp. --- dlls/itss/moniker.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/itss/moniker.c b/dlls/itss/moniker.c index 72d356b..02edd49 100644 --- a/dlls/itss/moniker.c +++ b/dlls/itss/moniker.c @@ -443,7 +443,7 @@ static HRESULT WINAPI ITS_IParseDisplayNameImpl_ParseDisplayName( TRACE("%p %s %p %p\n", This, debugstr_w( pszDisplayName ), pchEaten, ppmkOut ); - if( strncmpW( pszDisplayName, szPrefix, prefix_len ) ) + if( strncmpiW( pszDisplayName, szPrefix, prefix_len ) ) return MK_E_SYNTAX; /* search backwards for a double colon */

1 0

Andrew Eikum : mshtml: Fix WARN typo.
by Alexandre Julliard 10 Jan '12

10 Jan '12

Module: wine Branch: master Commit: abd9f382733ebd64e5bd6d000a08f17849822f1e URL: http://source.winehq.org/git/wine.git/?a=commit;h=abd9f382733ebd64e5bd6d000… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Jan 9 15:28:21 2012 -0600 mshtml: Fix WARN typo. --- dlls/mshtml/navigate.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/navigate.c b/dlls/mshtml/navigate.c index f5375e4..ea1f532 100644 --- a/dlls/mshtml/navigate.c +++ b/dlls/mshtml/navigate.c @@ -1045,7 +1045,7 @@ static void on_stop_nsrequest(nsChannelBSC *This, HRESULT result) (nsIRequest*)&This->nschannel->nsIHttpChannel_iface, This->nscontext, request_result); if(NS_FAILED(nsres)) - WARN("OnStopRequet failed: %08x\n", nsres); + WARN("OnStopRequest failed: %08x\n", nsres); } if(This->nschannel->load_group) {

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

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

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: 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 : 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 : 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

← Newer
1
...
71
72
73
74
75
76
77
...
98
Older →

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 January 2012