wine-commits January 2012

wine-commits@winehq.org

2 participants
972 discussions

Matteo Bruni : d3d8/tests: Add some RESZ tests.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 58a171d1de95ea473d9b1415c3162bb906be0b8d URL: http://source.winehq.org/git/wine.git/?a=commit;h=58a171d1de95ea473d9b1415c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:36 2012 +0100 d3d8/tests: Add some RESZ tests. --- dlls/d3d8/tests/visual.c | 317 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 317 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=58a171d1de95ea473d9b1…

1 0

Matteo Bruni : d3d9/tests: Add some RESZ tests.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: ec0c7a1605f3e4729e7dc66a2d3dfe0fcb06820c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ec0c7a1605f3e4729e7dc66a2… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:35 2012 +0100 d3d9/tests: Add some RESZ tests. --- dlls/d3d9/tests/visual.c | 475 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 475 insertions(+), 0 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=ec0c7a1605f3e4729e7dc…

1 0

Matteo Bruni : d3d8/tests: Test a multisampled -> not multisampled depth buffer copy.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 922f4696cfd7f59fc567455010d50f41adefa4b8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=922f4696cfd7f59fc56745501… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:34 2012 +0100 d3d8/tests: Test a multisampled -> not multisampled depth buffer copy. --- dlls/d3d8/tests/visual.c | 17 ++++++++++++++--- 1 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dlls/d3d8/tests/visual.c b/dlls/d3d8/tests/visual.c index dcaa091..e98d71a 100644 --- a/dlls/d3d8/tests/visual.c +++ b/dlls/d3d8/tests/visual.c @@ -2373,7 +2373,7 @@ static void shadow_test(IDirect3DDevice8 *device) static void multisample_copy_rects_test(IDirect3DDevice8 *device) { - IDirect3DSurface8 *original_ds, *original_rt, *rt, *readback; + IDirect3DSurface8 *original_ds, *original_rt, *ds, *ds_plain, *rt, *readback; RECT src_rect = {64, 64, 128, 128}; POINT dst_point = {96, 96}; D3DLOCKED_RECT locked_rect; @@ -2395,6 +2395,12 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_CreateRenderTarget(device, 256, 256, D3DFMT_A8R8G8B8, D3DMULTISAMPLE_2_SAMPLES, FALSE, &rt); ok(SUCCEEDED(hr), "Failed to create render target, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 256, 256, D3DFMT_D24S8, + D3DMULTISAMPLE_2_SAMPLES, &ds); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 256, 256, D3DFMT_D24S8, + D3DMULTISAMPLE_NONE, &ds_plain); + ok(SUCCEEDED(hr), "Failed to create depth stencil surface, hr %#x.\n", hr); hr = IDirect3DDevice8_CreateImageSurface(device, 256, 256, D3DFMT_A8R8G8B8, &readback); ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); @@ -2403,15 +2409,18 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) hr = IDirect3DDevice8_GetDepthStencilSurface(device, &original_ds); ok(SUCCEEDED(hr), "Failed to get depth/stencil, hr %#x.\n", hr); - hr = IDirect3DDevice8_SetRenderTarget(device, rt, NULL); + hr = IDirect3DDevice8_SetRenderTarget(device, rt, ds); ok(SUCCEEDED(hr), "Failed to set render target, hr %#x.\n", hr); - hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xff00ff00, 0.0, 0); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET | D3DCLEAR_ZBUFFER, 0xff00ff00, 1.0f, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); hr = IDirect3DDevice8_CopyRects(device, rt, NULL, 0, readback, NULL); ok(SUCCEEDED(hr), "Failed to read render target back, hr %#x.\n", hr); + hr = IDirect3DDevice8_CopyRects(device, ds, NULL, 0, ds_plain, NULL); + todo_wine ok(hr == D3DERR_INVALIDCALL, "Depth buffer copy, hr %#x, expected %#x.\n", hr, D3DERR_INVALIDCALL); + hr = IDirect3DDevice8_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0xffff0000, 0.0, 0); ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); @@ -2436,6 +2445,8 @@ static void multisample_copy_rects_test(IDirect3DDevice8 *device) IDirect3DSurface8_Release(original_ds); IDirect3DSurface8_Release(original_rt); IDirect3DSurface8_Release(readback); + IDirect3DSurface8_Release(ds_plain); + IDirect3DSurface8_Release(ds); IDirect3DSurface8_Release(rt); }

1 0

Matteo Bruni : d3d9/tests: Add a multisampled -> not multisampled depth buffer blit test.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 167b2869ff5fcd8cc68583ad108626154ac56755 URL: http://source.winehq.org/git/wine.git/?a=commit;h=167b2869ff5fcd8cc68583ad1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:33 2012 +0100 d3d9/tests: Add a multisampled -> not multisampled depth buffer blit test. --- dlls/d3d9/tests/visual.c | 119 +++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 106 insertions(+), 13 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=167b2869ff5fcd8cc6858…

1 0

Matteo Bruni : wined3d: Dirtify STATE_FRAMEBUFFER after a FBO depth blit.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: cf5bc7a7117b270c5351d61628b0307c710768ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf5bc7a7117b270c5351d6162… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Jan 18 23:41:32 2012 +0100 wined3d: Dirtify STATE_FRAMEBUFFER after a FBO depth blit. --- dlls/wined3d/surface.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index f38c148..7aa68d1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1071,6 +1071,7 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); + context_invalidate_state(context, STATE_FRAMEBUFFER); if (gl_mask & GL_DEPTH_BUFFER_BIT) {

1 0

Marcus Meissner : winedbg: LoadStringw gets character size, not bytes.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 11705f569ca931d3e138a6d3a3f0796dc67aa3a0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=11705f569ca931d3e138a6d3a… Author: Marcus Meissner <marcus(a)jet.franken.de> Date: Wed Jan 18 22:40:25 2012 +0100 winedbg: LoadStringw gets character size, not bytes. --- programs/winedbg/crashdlg.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 1f73979..fe13502 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -153,11 +153,11 @@ static void save_crash_log( HWND hwnd ) memset( &save, 0, sizeof(save) ); lstrcpyW( path, default_name ); - LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, sizeof(buffer) ); + LoadStringW( GetModuleHandleW(0), IDS_TEXT_FILES, buffer, sizeof(buffer)/sizeof(buffer[0]) ); p = buffer + lstrlenW(buffer) + 1; lstrcpyW(p, txt_files); p += lstrlenW(p) + 1; - LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, sizeof(buffer) - (p - buffer) ); + LoadStringW( GetModuleHandleW(0), IDS_ALL_FILES, p, sizeof(buffer)/sizeof(buffer[0]) - (p - buffer) ); p += lstrlenW(p) + 1; lstrcpyW(p, all_files); p += lstrlenW(p) + 1;

1 0

André Hentschel : winedbg: Also adjust the detailed crash dialog controls when maximized.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c8dd507b62d37268c8fcf1ee32fce3075ef8fe9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c8dd507b62d37268c8fcf1ee3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Wed Jan 18 22:03:59 2012 +0100 winedbg: Also adjust the detailed crash dialog controls when maximized. --- programs/winedbg/crashdlg.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/programs/winedbg/crashdlg.c b/programs/winedbg/crashdlg.c index 39e9bce..1f73979 100644 --- a/programs/winedbg/crashdlg.c +++ b/programs/winedbg/crashdlg.c @@ -310,7 +310,7 @@ static INT_PTR WINAPI details_dlg_proc( HWND hwnd, UINT msg, WPARAM wparam, LPAR return TRUE; case WM_SIZE: - if (wparam == SIZE_RESTORED) + if (wparam == SIZE_RESTORED || wparam == SIZE_MAXIMIZED) { int off_x = (short)LOWORD( lparam ) - orig_size.x; int off_y = (short)HIWORD( lparam ) - orig_size.y;

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDECLUSAGE typedef.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: bee9adbd05b083d628d5c1030db1c1ea244eb095 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bee9adbd05b083d628d5c1030… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:22 2012 +0100 wined3d: Get rid of the WINED3DDECLUSAGE typedef. --- dlls/d3d8/vertexdeclaration.c | 37 ++++++++------- dlls/wined3d/arb_program_shader.c | 35 ++++++++------- dlls/wined3d/device.c | 20 ++++---- dlls/wined3d/glsl_shader.c | 18 ++++---- dlls/wined3d/shader.c | 91 +++++++++++++++++++----------------- dlls/wined3d/utils.c | 34 +++++++------- dlls/wined3d/vertexdeclaration.c | 59 +++++++++++++----------- dlls/wined3d/wined3d_private.h | 8 ++-- include/wine/wined3d.h | 34 +++++++------- 9 files changed, 176 insertions(+), 160 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bee9adbd05b083d628d5c…

1 0

Henri Verbeet : wined3d: Get rid of the WINED3DDECLMETHOD typedef.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: c35c30fa6883025e873c8630073d59876d464d24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c35c30fa6883025e873c86300… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:21 2012 +0100 wined3d: Get rid of the WINED3DDECLMETHOD typedef. --- dlls/d3d10core/inputlayout.c | 2 +- dlls/d3d8/vertexdeclaration.c | 2 +- dlls/wined3d/utils.c | 22 ++++++++++++---------- dlls/wined3d/vertexdeclaration.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- include/wine/wined3d.h | 20 ++++++++++---------- 6 files changed, 26 insertions(+), 24 deletions(-) diff --git a/dlls/d3d10core/inputlayout.c b/dlls/d3d10core/inputlayout.c index dfc4ad7..d6ae787 100644 --- a/dlls/d3d10core/inputlayout.c +++ b/dlls/d3d10core/inputlayout.c @@ -80,7 +80,7 @@ static HRESULT d3d10_input_layout_to_wined3d_declaration(const D3D10_INPUT_ELEME e->input_slot = f->InputSlot; e->offset = f->AlignedByteOffset; e->output_slot = is.elements[j].register_idx; - e->method = WINED3DDECLMETHOD_DEFAULT; + e->method = WINED3D_DECL_METHOD_DEFAULT; e->usage = 0; e->usage_idx = 0; diff --git a/dlls/d3d8/vertexdeclaration.c b/dlls/d3d8/vertexdeclaration.c index 7ca8783..659256f 100644 --- a/dlls/d3d8/vertexdeclaration.c +++ b/dlls/d3d8/vertexdeclaration.c @@ -335,7 +335,7 @@ static UINT convert_to_wined3d_declaration(const DWORD *d3d8_elements, DWORD *d3 element->input_slot = stream; element->offset = offset; element->output_slot = reg; - element->method = WINED3DDECLMETHOD_DEFAULT; + element->method = WINED3D_DECL_METHOD_DEFAULT; element->usage = wined3d_usage_lookup[reg].usage; element->usage_idx = wined3d_usage_lookup[reg].usage_idx; diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 35775df..879015e 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -1934,19 +1934,21 @@ const char *debug_d3dusagequery(DWORD usagequery) return buf[0] ? wine_dbg_sprintf("%s", &buf[3]) : "0"; } -const char* debug_d3ddeclmethod(WINED3DDECLMETHOD method) { - switch (method) { +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) +{ + switch (method) + { #define WINED3DDECLMETHOD_TO_STR(u) case u: return #u - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_DEFAULT); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALU); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_PARTIALV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_CROSSUV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_UV); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUP); - WINED3DDECLMETHOD_TO_STR(WINED3DDECLMETHOD_LOOKUPPRESAMPLED); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_DEFAULT); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_U); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_PARTIAL_V); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_CROSS_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_UV); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP); + WINED3DDECLMETHOD_TO_STR(WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED); #undef WINED3DDECLMETHOD_TO_STR default: - FIXME("Unrecognized %u declaration method!\n", method); + FIXME("Unrecognized declaration method %#x.\n", method); return "unrecognized"; } } diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index 576fe7c..6539964 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -289,7 +289,7 @@ static void append_decl_element(struct wined3d_fvf_convert_state *state, elements[idx].input_slot = 0; elements[idx].offset = offset; elements[idx].output_slot = 0; - elements[idx].method = WINED3DDECLMETHOD_DEFAULT; + elements[idx].method = WINED3D_DECL_METHOD_DEFAULT; elements[idx].usage = usage; elements[idx].usage_idx = usage_idx; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 5ca9d23..9efbdb0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2491,7 +2491,7 @@ const char *debug_d3ddevicetype(enum wined3d_device_type device_type) DECLSPEC_H const char *debug_d3dresourcetype(enum wined3d_resource_type resource_type) DECLSPEC_HIDDEN; const char *debug_d3dusage(DWORD usage) DECLSPEC_HIDDEN; const char *debug_d3dusagequery(DWORD usagequery) DECLSPEC_HIDDEN; -const char *debug_d3ddeclmethod(WINED3DDECLMETHOD method) DECLSPEC_HIDDEN; +const char *debug_d3ddeclmethod(enum wined3d_decl_method method) DECLSPEC_HIDDEN; const char *debug_d3ddeclusage(BYTE usage) DECLSPEC_HIDDEN; const char *debug_d3dprimitivetype(enum wined3d_primitive_type primitive_type) DECLSPEC_HIDDEN; const char *debug_d3drenderstate(enum wined3d_render_state state) DECLSPEC_HIDDEN; diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index f1e389d..e82b721 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -719,16 +719,16 @@ enum wined3d_stateblock_type WINED3D_SBT_RECORDED = 4, /* WineD3D private */ }; -typedef enum _WINED3DDECLMETHOD -{ - WINED3DDECLMETHOD_DEFAULT = 0, - WINED3DDECLMETHOD_PARTIALU = 1, - WINED3DDECLMETHOD_PARTIALV = 2, - WINED3DDECLMETHOD_CROSSUV = 3, - WINED3DDECLMETHOD_UV = 4, - WINED3DDECLMETHOD_LOOKUP = 5, - WINED3DDECLMETHOD_LOOKUPPRESAMPLED = 6 -} WINED3DDECLMETHOD; +enum wined3d_decl_method +{ + WINED3D_DECL_METHOD_DEFAULT = 0, + WINED3D_DECL_METHOD_PARTIAL_U = 1, + WINED3D_DECL_METHOD_PARTIAL_V = 2, + WINED3D_DECL_METHOD_CROSS_UV = 3, + WINED3D_DECL_METHOD_UV = 4, + WINED3D_DECL_METHOD_LOOKUP = 5, + WINED3D_DECL_METHOD_LOOKUP_PRESAMPLED = 6, +}; typedef enum _WINED3DDECLUSAGE {

1 0

Henri Verbeet : ddraw: Just pin all version 1 surfaces.
by Alexandre Julliard 19 Jan '12

19 Jan '12

Module: wine Branch: master Commit: 67d4be0347f39e5c6b8536dcaa91b405ed359b81 URL: http://source.winehq.org/git/wine.git/?a=commit;h=67d4be0347f39e5c6b8536dca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jan 18 21:46:20 2012 +0100 ddraw: Just pin all version 1 surfaces. --- dlls/ddraw/surface.c | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 60f29dc..595d141 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -5474,15 +5474,16 @@ HRESULT ddraw_surface_init(IDirectDrawSurfaceImpl *surface, IDirectDrawImpl *ddr desc->ddsCaps.dwCaps |= DDSCAPS_LOCALVIDMEM | DDSCAPS_VIDEOMEMORY; } + /* Some applications assume surfaces will always be mapped at the same + * address. Some of those also assume that this address is valid even when + * the surface isn't mapped, and that updates done this way will be + * visible on the screen. The game Nox is such an application, + * Commandos: Behind Enemy Lines is another. */ + if (version == 1) + flags |= WINED3D_SURFACE_PIN_SYSMEM; + if (desc->ddsCaps.dwCaps & DDSCAPS_PRIMARYSURFACE) { - /* Some applications assume that the primary surface will always be - * mapped at the same address. Some of those also assume that this - * address is valid even when the surface isn't mapped, and that - * updates done this way will be visible on the screen. The game Nox - * is such an application. */ - if (version == 1) - flags |= WINED3D_SURFACE_PIN_SYSMEM; usage |= WINED3DUSAGE_RENDERTARGET; desc->ddsCaps.dwCaps |= DDSCAPS_VISIBLE; }

1 0

← Newer
1
...
36
37
38
39
40
41
42
...
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