wine-commits March 2010

wine-commits@winehq.org

3 participants
919 discussions

Henri Verbeet : wined3d: Source and destination formats should match in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 88a2decc499240ff1dcd51265623f6e2125b53d8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=88a2decc499240ff1dcd51265… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:45 2010 +0200 wined3d: Source and destination formats should match in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 26 +++++++++----------------- 1 files changed, 9 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 351d038..caa9568 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5194,6 +5194,12 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, return WINED3DERR_INVALIDCALL; } + if (srcFormat != destFormat) + { + WARN("Source and destination surfaces should have the same format.\n"); + return WINED3DERR_INVALIDCALL; + } + /* This call loads the opengl surface directly, instead of copying the surface to the * destination's sysmem copy. If surface conversion is needed, use BltFast instead to * copy in sysmem and use regular surface loading. @@ -5206,14 +5212,6 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, pSourceSurface, pSourceRect, 0); } - if (destFormat == WINED3DFMT_UNKNOWN) { - TRACE("(%p) : Converting destination surface from WINED3DFMT_UNKNOWN to the source format\n", This); - IWineD3DSurface_SetFormat(pDestinationSurface, srcFormat); - - /* Get the update surface description */ - IWineD3DSurface_GetDesc(pDestinationSurface, &winedesc); - } - context = context_acquire(This, NULL, CTXUSAGE_RESOURCELOAD); ENTER_GL(); @@ -5292,15 +5290,9 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ FIXME("Updating part of a compressed texture is not supported.\n"); } - if (destFormat != srcFormat) - { - FIXME("Updating mixed format compressed textures is not supported.\n"); - } - else - { - GL_EXTCALL(glCompressedTexImage2DARB(dst_impl->texture_target, dst_impl->texture_level, - dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); - } + + GL_EXTCALL(glCompressedTexImage2DARB(dst_impl->texture_target, dst_impl->texture_level, + dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); } checkGLcall("glCompressedTexSubImage2DARB"); }

1 0

Henri Verbeet : wined3d: Use GL_UNPACK_ROW_LENGTH for partial updates of regular surfaces in IWineD3DDeviceImpl_UpdateSurface ().
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 0eae42ddc678638a6e22e69f5101bbc9aeb3a8ba URL: http://source.winehq.org/git/wine.git/?a=commit;h=0eae42ddc678638a6e22e69f5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:44 2010 +0200 wined3d: Use GL_UNPACK_ROW_LENGTH for partial updates of regular surfaces in IWineD3DDeviceImpl_UpdateSurface(). --- dlls/wined3d/device.c | 51 ++++++++++++++++++------------------------------ 1 files changed, 19 insertions(+), 32 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index cba1447..351d038 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5261,14 +5261,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, ENTER_GL(); - /* TODO: Cube and volume support */ - if (rowoffset) /* Not a whole row so we have to do it a line at a time. */ + if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) { - if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) + const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)); + + if (rowoffset) { - const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)); UINT row_length = (srcWidth / src_format_desc->block_width) * src_format_desc->block_byte_count; - UINT row_count = srcHeight / src_format_desc->block_height; + UINT row_count = srcHeight / src_format_desc->block_height; UINT src_pitch = IWineD3DSurface_GetPitch(pSourceSurface); UINT y = destTop; UINT row; @@ -5279,32 +5279,14 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, for (row = 0; row < row_count; ++row) { GL_EXTCALL(glCompressedTexSubImage2DARB(dst_impl->texture_target, dst_impl->texture_level, - destLeft, y, srcWidth, src_format_desc->block_height, - dst_format_desc->glInternal, row_length, data)); + destLeft, y, srcWidth, src_format_desc->block_height, + dst_format_desc->glInternal, row_length, data)); y += src_format_desc->block_height; data += src_pitch; } - checkGLcall("glCompressedTexSubImage2DARB"); } else { - const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; - unsigned int j; - - for (j = destTop; j < (srcHeight + destTop); ++j) - { - glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, j, - srcWidth, 1, dst_format_desc->glFormat, dst_format_desc->glType,data); - data += rowoffset; - } - } - } - else /* Full width, so just write out the whole texture. */ - { - const unsigned char* data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; - - if (dst_format_desc->Flags & WINED3DFMT_FLAG_COMPRESSED) - { if (destSurfaceHeight != srcHeight || destSurfaceWidth != srcWidth) { /* FIXME: The easy way to do this is to lock the destination, and copy the bits across. */ @@ -5320,13 +5302,18 @@ static HRESULT WINAPI IWineD3DDeviceImpl_UpdateSurface(IWineD3DDevice *iface, dst_format_desc->glInternal, srcWidth, srcHeight, 0, destSize, data)); } } - else - { - glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop, - srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); - } - } - checkGLcall("glTexSubImage2D"); + checkGLcall("glCompressedTexSubImage2DARB"); + } + else + { + const unsigned char *data = ((const unsigned char *)IWineD3DSurface_GetData(pSourceSurface)) + offset; + + glPixelStorei(GL_UNPACK_ROW_LENGTH, srcSurfaceWidth); + glTexSubImage2D(dst_impl->texture_target, dst_impl->texture_level, destLeft, destTop, + srcWidth, srcHeight, dst_format_desc->glFormat, dst_format_desc->glType, data); + glPixelStorei(GL_UNPACK_ROW_LENGTH, 0); + checkGLcall("glTexSubImage2D"); + } LEAVE_GL(); context_release(context);

1 0

Henri Verbeet : wined3d: Initialization functions don't allocate.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 2533860114290f2310e4a4ce50ac9e26a8b3c21e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2533860114290f2310e4a4ce5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Mar 30 11:24:43 2010 +0200 wined3d: Initialization functions don't allocate. --- dlls/wined3d/buffer.c | 14 ++++++++++---- dlls/wined3d/query.c | 29 ++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 19 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 68417ff..1447a4f 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -798,15 +798,21 @@ static void buffer_sync_apple(struct wined3d_buffer *This, DWORD flags, const st if(!This->query) { - HRESULT hr; TRACE("Creating event query for buffer %p\n", This); - hr = wined3d_event_query_init(gl_info, &This->query); - if(FAILED(hr)) + if (!wined3d_event_query_supported(gl_info)) { - ERR("Failed to create an event query, dropping async buffer locks\n"); + FIXME("Event queries not supported, dropping async buffer locks.\n"); goto drop_query; } + + This->query = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*This->query)); + if (!This->query) + { + ERR("Failed to allocate event query memory, dropping async buffer locks.\n"); + goto drop_query; + } + /* Since we don't know about old draws a glFinish is needed once */ wglFinish(); return; diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 59e385e..90cdbd4 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -27,22 +27,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(d3d); #define GLINFO_LOCATION (*gl_info) -HRESULT wined3d_event_query_init(const struct wined3d_gl_info *gl_info, struct wined3d_event_query **query) +BOOL wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) { - struct wined3d_event_query *ret; - *query = NULL; - if (!gl_info->supported[ARB_SYNC] && !gl_info->supported[NV_FENCE] - && !gl_info->supported[APPLE_FENCE]) return E_NOTIMPL; - - ret = HeapAlloc(GetProcessHeap(), 0, sizeof(*ret)); - if (!ret) - { - ERR("Failed to allocate a wined3d event query structure.\n"); - return E_OUTOFMEMORY; - } - ret->context = NULL; - *query = ret; - return WINED3D_OK; + return gl_info->supported[ARB_SYNC] || gl_info->supported[NV_FENCE] || gl_info->supported[APPLE_FENCE]; } void wined3d_event_query_destroy(struct wined3d_event_query *query) @@ -593,7 +580,6 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, WINED3DQUERYTYPE type, IUnknown *parent) { const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; - HRESULT hr; switch (type) { @@ -616,9 +602,7 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, case WINED3DQUERYTYPE_EVENT: TRACE("Event query.\n"); - query->lpVtbl = &IWineD3DEventQuery_Vtbl; - hr = wined3d_event_query_init(gl_info, (struct wined3d_event_query **) &query->extendedData); - if (hr == E_NOTIMPL) + if (!wined3d_event_query_supported(gl_info)) { /* Half-Life 2 needs this query. It does not render the main * menu correctly otherwise. Pretend to support it, faking @@ -626,9 +610,12 @@ HRESULT query_init(IWineD3DQueryImpl *query, IWineD3DDeviceImpl *device, * lowering performance. */ FIXME("Event query: Unimplemented, but pretending to be supported.\n"); } - else if(FAILED(hr)) + query->lpVtbl = &IWineD3DEventQuery_Vtbl; + query->extendedData = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(struct wined3d_event_query)); + if (!query->extendedData) { - return hr; + ERR("Failed to allocate event query memory.\n"); + return E_OUTOFMEMORY; } break; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 77c7d83..867510c 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1033,11 +1033,11 @@ enum wined3d_event_query_result WINED3D_EVENT_QUERY_ERROR }; -HRESULT wined3d_event_query_init(const struct wined3d_gl_info *gl_info, struct wined3d_event_query **query) DECLSPEC_HIDDEN; void wined3d_event_query_destroy(struct wined3d_event_query *query) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_test(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; enum wined3d_event_query_result wined3d_event_query_finish(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; void wined3d_event_query_issue(struct wined3d_event_query *query, IWineD3DDeviceImpl *device) DECLSPEC_HIDDEN; +HRESULT wined3d_event_query_supported(const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; struct wined3d_context {

1 0

Maarten Lankhorst : mmdevapi: Add capture tests.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: a9e43cad157e4a41f0a9d5cfe0b95cff2eba14b3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a9e43cad157e4a41f0a9d5cfe… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 17 22:07:07 2010 +0100 mmdevapi: Add capture tests. --- dlls/mmdevapi/tests/Makefile.in | 1 + dlls/mmdevapi/tests/capture.c | 334 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 335 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=a9e43cad157e4a41f0a9d…

1 0

Maarten Lankhorst : mmdevapi: Add a few more render tests.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 714ae4112a2c81a26adbfb36f2b905f76b95594d URL: http://source.winehq.org/git/wine.git/?a=commit;h=714ae4112a2c81a26adbfb36f… Author: Maarten Lankhorst <m.b.lankhorst(a)gmail.com> Date: Wed Mar 17 22:06:47 2010 +0100 mmdevapi: Add a few more render tests. --- dlls/mmdevapi/tests/render.c | 17 +++++++++++++++++ 1 files changed, 17 insertions(+), 0 deletions(-) diff --git a/dlls/mmdevapi/tests/render.c b/dlls/mmdevapi/tests/render.c index 23c158b..56fea02 100644 --- a/dlls/mmdevapi/tests/render.c +++ b/dlls/mmdevapi/tests/render.c @@ -192,6 +192,14 @@ static void test_audioclient(IAudioClient *ac) return; } + hr = IAudioClient_GetStreamLatency(ac, NULL); + ok(hr == E_POINTER, "GetStreamLatency(NULL) call returns %08x\n", hr); + + hr = IAudioClient_GetStreamLatency(ac, &t1); + ok(hr == S_OK, "Valid GetStreamLatency call returns %08x\n", hr); + trace("Returned latency: %u.%05u ms\n", + (UINT)(t1/10000), (UINT)(t1 % 10000)); + hr = IAudioClient_Initialize(ac, AUDCLNT_SHAREMODE_SHARED, 0, 5000000, 0, pwfx, NULL); ok(hr == AUDCLNT_E_ALREADY_INITIALIZED, "Calling Initialize twice returns %08x\n", hr); @@ -204,6 +212,15 @@ static void test_audioclient(IAudioClient *ac) hr == HRESULT_FROM_WIN32(ERROR_BAD_PATHNAME) /* Some Vista */ , "SetEventHandle returns %08x\n", hr); + hr = IAudioClient_Reset(ac); + ok(hr == S_OK, "Reset on a resetted stream returns %08x\n", hr); + + hr = IAudioClient_Stop(ac); + ok(hr == S_FALSE, "Stop on a stopped stream returns %08x\n", hr); + + hr = IAudioClient_Start(ac); + ok(hr == S_OK, "Start on a stopped stream returns %08x\n", hr); + CloseHandle(handle); CoTaskMemFree(pwfx); }

1 0

André Hentschel : oleaut32: Add some spaces to the test output for better reading.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 81c812ecbaba563851ebcc1bc2c88a7ae4884152 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81c812ecbaba563851ebcc1bc… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Mar 29 20:34:16 2010 +0200 oleaut32: Add some spaces to the test output for better reading. --- dlls/oleaut32/tests/vartype.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index b973a54..d785a59 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -3514,7 +3514,7 @@ static void test_VarDateChangeTypeEx(void) #define EXPECTCY64(x,y) \ ok(hres == S_OK && S(out).Hi == (LONG)x && S(out).Lo == y, \ - "expected " #x #y "(%u,%u), got (%u,%u); hres=0x%08x\n", \ + "expected " #x " " #y " (%u,%u), got (%u,%u); hres=0x%08x\n", \ (ULONG)(x), (ULONG)(y), S(out).Hi, S(out).Lo, hres) static void test_VarCyFromI1(void)

1 0

Roderick Colenbrander : wined3d: Disable flipping through the source rectangle in BltOverride.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: c864ae6348aab90da305cfc143575dce77f82682 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c864ae6348aab90da305cfc14… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 29 13:39:30 2010 +0200 wined3d: Disable flipping through the source rectangle in BltOverride. --- dlls/wined3d/surface.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 4803964..c1ae2d2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3936,7 +3936,7 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const if((srcSwapchain || SrcSurface == myDevice->render_targets[0]) && !dstSwapchain) { /* Blit from render target to texture */ WINED3DRECT srect; - BOOL upsideDown, stretchx; + BOOL upsideDown = FALSE, stretchx; BOOL paletteOverride = FALSE; if(Flags & (WINEDDBLT_KEYSRC | WINEDDBLT_KEYSRCOVERRIDE)) { @@ -3945,19 +3945,9 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const /* Destination color key is checked above */ } - /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag - * glCopyTexSubImage is a bit picky about the parameters we pass to it - */ if(SrcRect) { - if(SrcRect->top < SrcRect->bottom) { - srect.y1 = SrcRect->top; - srect.y2 = SrcRect->bottom; - upsideDown = FALSE; - } else { - srect.y1 = SrcRect->bottom; - srect.y2 = SrcRect->top; - upsideDown = TRUE; - } + srect.y1 = SrcRect->top; + srect.y2 = SrcRect->bottom; srect.x1 = SrcRect->left; srect.x2 = SrcRect->right; } else { @@ -3965,13 +3955,16 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const srect.y1 = 0; srect.x2 = Src->currentDesc.Width; srect.y2 = Src->currentDesc.Height; - upsideDown = FALSE; } + + /* Make sure that the top pixel is always above the bottom pixel, and keep a separate upside down flag + * glCopyTexSubImage is a bit picky about the parameters we pass to it + */ if(rect.y1 > rect.y2) { UINT tmp = rect.y2; rect.y2 = rect.y1; rect.y1 = tmp; - upsideDown = !upsideDown; + upsideDown = TRUE; } if(rect.x2 - rect.x1 != srect.x2 - srect.x1) {

1 0

Roderick Colenbrander : wined3d: Fix a destination flipping bug using the destination rectangle.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 334fea7d795af840c8f4b2a4c8f295f3bbc09211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=334fea7d795af840c8f4b2a4c… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 29 13:35:35 2010 +0200 wined3d: Fix a destination flipping bug using the destination rectangle. --- dlls/wined3d/surface.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9d1e804..4803964 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3967,10 +3967,10 @@ static HRESULT IWineD3DSurfaceImpl_BltOverride(IWineD3DSurfaceImpl *This, const srect.y2 = Src->currentDesc.Height; upsideDown = FALSE; } - if(rect.x1 > rect.x2) { - UINT tmp = rect.x2; - rect.x2 = rect.x1; - rect.x1 = tmp; + if(rect.y1 > rect.y2) { + UINT tmp = rect.y2; + rect.y2 = rect.y1; + rect.y1 = tmp; upsideDown = !upsideDown; }

1 0

Roderick Colenbrander : d3d9: Add source/ destination and backbuffer tests for StretchRect.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 342c6c6de57d8e757991cf99278134b60e54c64d URL: http://source.winehq.org/git/wine.git/?a=commit;h=342c6c6de57d8e757991cf992… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Mon Mar 29 13:32:56 2010 +0200 d3d9: Add source/destination and backbuffer tests for StretchRect. --- dlls/d3d9/tests/visual.c | 159 +++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 156 insertions(+), 3 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=342c6c6de57d8e757991c…

1 0

Roderick Colenbrander : ddraw: Add some DirectDraw Blt tests.
by Alexandre Julliard 30 Mar '10

30 Mar '10

Module: wine Branch: master Commit: 2930f849617600b5e070f7ba65d9a4b25c01f560 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2930f849617600b5e070f7ba6… Author: Roderick Colenbrander <thunderbird2k(a)gmail.com> Date: Sat Mar 27 18:16:44 2010 +0100 ddraw: Add some DirectDraw Blt tests. --- dlls/ddraw/tests/visual.c | 108 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 108 insertions(+), 0 deletions(-) diff --git a/dlls/ddraw/tests/visual.c b/dlls/ddraw/tests/visual.c index 221e6d1..290cb76 100644 --- a/dlls/ddraw/tests/visual.c +++ b/dlls/ddraw/tests/visual.c @@ -558,6 +558,113 @@ static void fog_test(IDirect3DDevice7 *device) ok(hr == D3D_OK, "Turning off fog calculations returned %08x\n", hr); } +static void blt_test(IDirect3DDevice7 *device) +{ + IDirectDrawSurface7 *backbuffer = NULL, *offscreen = NULL; + DDSURFACEDESC2 ddsd; + HRESULT hr; + + memset(&ddsd, 0, sizeof(ddsd)); + ddsd.dwSize = sizeof(ddsd); + U4(ddsd).ddpfPixelFormat.dwSize = sizeof(U4(ddsd).ddpfPixelFormat); + ddsd.dwFlags = DDSD_WIDTH | DDSD_HEIGHT | DDSD_CAPS; + ddsd.dwWidth = 640; + ddsd.dwHeight = 480; + ddsd.ddsCaps.dwCaps = DDSCAPS_TEXTURE | DDSCAPS_3DDEVICE; + hr = IDirectDraw7_CreateSurface(DirectDraw, &ddsd, &offscreen, NULL); + ok(hr == D3D_OK, "Creating the offscreen render target failed, hr = %08x\n", hr); + + /* Offscreen blits with the same source as destination */ + if(SUCCEEDED(hr)) + { + RECT src_rect, dst_rect; + + /* Blit the whole surface to itself */ + hr = IDirectDrawSurface_Blt(offscreen, NULL, offscreen, NULL, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit, flip-y through source rectangle (not allowed) */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 640; + src_rect.top = 480; src_rect.bottom = 0; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "IDirectDrawSurface7_Blt returned %08x\n", hr); + + /* Overlapped blit, with shrinking in x */ + dst_rect.left = 0; dst_rect.right = 480; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 160; src_rect.right = 480; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, offscreen, &src_rect, 0, NULL); + ok(hr == DD_OK, "IDirectDrawSurface7_Blt returned %08x\n", hr); + } + + hr = IDirect3DDevice7_GetRenderTarget(device, &backbuffer); + ok(hr == D3D_OK, "Unable to obtain a surface pointer to the backbuffer, hr = %08x\n", hr); + + /* backbuffer ==> texture blits */ + if(SUCCEEDED(hr) && offscreen) + { + RECT src_rect, dst_rect; + + /* backbuffer ==> texture, src_rect=NULL, dst_rect=NULL, no scaling */ + hr = IDirectDrawSurface_Blt(offscreen, NULL, backbuffer, NULL, 0, NULL); + ok(hr == DD_OK, "fullscreen Blt from backbuffer => texture failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, full surface blits, no scaling */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.bottom = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DD_OK, "fullscreen Blt from backbuffer => texture failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in y-direction through source rectangle, no scaling (allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 480; dst_rect.top = 0; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DD_OK, "backbuffer => texture flip-y src_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in x-direction through source rectangle, no scaling (not allowed) */ + dst_rect.left = 640; dst_rect.right = 0; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-x src_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in y-direction through destination rectangle (not allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 0; src_rect.right = 640; + src_rect.top = 480; src_rect.bottom = 0; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-y dst_rect failed with hr = %08x\n", hr); + + /* backbuffer ==> texture, flip in x-direction through destination rectangle, no scaling (not allowed) */ + dst_rect.left = 0; dst_rect.right = 640; + dst_rect.top = 0; dst_rect.top = 480; + src_rect.left = 640; src_rect.right = 0; + src_rect.top = 0; src_rect.bottom = 480; + hr = IDirectDrawSurface_Blt(offscreen, &dst_rect, backbuffer, &src_rect, 0, NULL); + ok(hr == DDERR_INVALIDRECT, "backbuffer => texture flip-x dst_rect failed with hr = %08x\n", hr); + } + + if(offscreen) IDirectDrawSurface7_Release(offscreen); + if(backbuffer) IDirectDrawSurface7_Release(backbuffer); +} + static void offscreen_test(IDirect3DDevice7 *device) { HRESULT hr; @@ -2853,6 +2960,7 @@ START_TEST(visual) } /* Now run the tests */ + blt_test(Direct3DDevice); depth_clamp_test(Direct3DDevice); lighting_test(Direct3DDevice); clear_test(Direct3DDevice);

1 0

← Newer
1
...
6
7
8
9
10
11
12
...
92
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 March 2010