February 2013 - Wine-commits

Jacek Caban : jscript: Use to_int32 in to_uint32 implementation.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 1926b5617d93adf1a779e640553b8635297caa7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1926b5617d93adf1a779e6405… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:45:42 2013 +0100 jscript: Use to_int32 in to_uint32 implementation. --- dlls/jscript/jscript.h | 2 +- dlls/jscript/jsutils.c | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index b060378..35e2c3f 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -320,7 +320,7 @@ HRESULT to_boolean(jsval_t,BOOL*) DECLSPEC_HIDDEN; HRESULT to_number(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_integer(script_ctx_t*,jsval_t,double*) DECLSPEC_HIDDEN; HRESULT to_int32(script_ctx_t*,jsval_t,INT*) DECLSPEC_HIDDEN; -HRESULT to_uint32(script_ctx_t*,jsval_t,DWORD*) DECLSPEC_HIDDEN; +HRESULT to_uint32(script_ctx_t*,jsval_t,UINT32*) DECLSPEC_HIDDEN; HRESULT to_string(script_ctx_t*,jsval_t,jsstr_t**) DECLSPEC_HIDDEN; HRESULT to_object(script_ctx_t*,jsval_t,IDispatch**) DECLSPEC_HIDDEN; diff --git a/dlls/jscript/jsutils.c b/dlls/jscript/jsutils.c index 863ff33..dd04186 100644 --- a/dlls/jscript/jsutils.c +++ b/dlls/jscript/jsutils.c @@ -665,15 +665,13 @@ HRESULT to_int32(script_ctx_t *ctx, jsval_t v, INT *ret) /* ECMA-262 3rd Edition 9.6 */ HRESULT to_uint32(script_ctx_t *ctx, jsval_t val, DWORD *ret) { - double n; + INT32 n; HRESULT hres; - hres = to_number(ctx, val, &n); - if(FAILED(hres)) - return hres; - - *ret = isnan(n) || isinf(n) ? 0 : n; - return S_OK; + hres = to_int32(ctx, val, &n); + if(SUCCEEDED(hres)) + *ret = n; + return hres; } static jsstr_t *int_to_string(int i)

1 0

Jacek Caban : jscript: Fixed BSTR leak.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: ee880b28c5d3d1aecd2b04e6082f8ddad99bdac2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee880b28c5d3d1aecd2b04e60… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 12:45:56 2013 +0100 jscript: Fixed BSTR leak. --- dlls/jscript/compile.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/jscript/compile.c b/dlls/jscript/compile.c index ad00591..c776c83 100644 --- a/dlls/jscript/compile.c +++ b/dlls/jscript/compile.c @@ -791,7 +791,7 @@ static HRESULT literal_as_bstr(compiler_ctx_t *ctx, literal_t *literal, BSTR *st if(FAILED(hres)) return hres; - *str = SysAllocStringLen(jsstr->str, jsstr_length(jsstr)); + *str = compiler_alloc_bstr(ctx, jsstr->str); jsstr_release(jsstr); break; }

1 0

Jörg Höhle : ntdll: Stabilize CreateTimerQueueTimer callbacks over time.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 2f0b93ca134ca68857bef36a3f2a5cf8f620740a URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f0b93ca134ca68857bef36a3… Author: Jörg Höhle <hoehle(a)users.sourceforge.net> Date: Sun Mar 4 07:30:18 2012 +0100 ntdll: Stabilize CreateTimerQueueTimer callbacks over time. --- dlls/ntdll/threadpool.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/dlls/ntdll/threadpool.c b/dlls/ntdll/threadpool.c index f246cfb..e33a025 100644 --- a/dlls/ntdll/threadpool.c +++ b/dlls/ntdll/threadpool.c @@ -651,13 +651,21 @@ static void queue_timer_expire(struct timer_queue *q) RtlEnterCriticalSection(&q->cs); if (list_head(&q->timers)) { + ULONGLONG now, next; t = LIST_ENTRY(list_head(&q->timers), struct queue_timer, entry); - if (!t->destroy && t->expire <= queue_current_time()) + if (!t->destroy && t->expire <= ((now = queue_current_time()))) { ++t->runcount; - queue_move_timer( - t, t->period ? queue_current_time() + t->period : EXPIRE_NEVER, - FALSE); + if (t->period) + { + next = t->expire + t->period; + /* avoid trigger cascade if overloaded / hibernated */ + if (next < now) + next = now + t->period; + } + else + next = EXPIRE_NEVER; + queue_move_timer(t, next, FALSE); } else t = NULL;

1 0

Michael Stefaniuc : mshtml: Fix copy and paste error.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 52bdc93e723847240f8a46d0eaff191ac77be903 URL: http://source.winehq.org/git/wine.git/?a=commit;h=52bdc93e723847240f8a46d0e… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Tue Feb 19 15:17:08 2013 +0100 mshtml: Fix copy and paste error. --- dlls/mshtml/npplugin.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/npplugin.c b/dlls/mshtml/npplugin.c index aa74961..e681568 100644 --- a/dlls/mshtml/npplugin.c +++ b/dlls/mshtml/npplugin.c @@ -470,7 +470,7 @@ static ULONG WINAPI WindowForBindingUI_AddRef(IWindowForBindingUI *iface) static ULONG WINAPI WindowForBindingUI_Release(IWindowForBindingUI *iface) { InstallCallback *This = impl_from_IWindowForBindingUI(iface); - return IBindStatusCallback_AddRef(&This->IBindStatusCallback_iface); + return IBindStatusCallback_Release(&This->IBindStatusCallback_iface); } static HRESULT WINAPI WindowForBindingUI_GetWindow(IWindowForBindingUI *iface, REFGUID rguidReason, HWND *phwnd)

1 0

Jacek Caban : mshtml: Don' t crash if fire_event_obj is called on detached document.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 5069ad71b4ce3a0bf8b084842672573837e1a88a URL: http://source.winehq.org/git/wine.git/?a=commit;h=5069ad71b4ce3a0bf8b084842… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Feb 19 17:05:11 2013 +0100 mshtml: Don't crash if fire_event_obj is called on detached document. --- dlls/mshtml/htmlevent.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/dlls/mshtml/htmlevent.c b/dlls/mshtml/htmlevent.c index ea0201f..97f9ea9 100644 --- a/dlls/mshtml/htmlevent.c +++ b/dlls/mshtml/htmlevent.c @@ -1057,9 +1057,14 @@ static void fire_event_obj(HTMLDocumentNode *doc, eventid_t eid, HTMLEventObj *e TRACE("(%p) %s\n", doc, debugstr_w(event_info[eid].name)); + window = doc->window; + if(!window) { + WARN("NULL window\n"); + return; + } + htmldoc_addref(&doc->basedoc); - window = doc->window; prev_event = window->event; window->event = event_obj ? &event_obj->IHTMLEventObj_iface : NULL;

1 0

André Hentschel : ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM .
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 242da6708202c1bd4835e49e2dd2315c95ba0e24 URL: http://source.winehq.org/git/wine.git/?a=commit;h=242da6708202c1bd4835e49e2… Author: André Hentschel <nerv(a)dawncrow.de> Date: Mon Feb 18 23:24:15 2013 +0100 ntdll: Correctly align the stack for odd numbers of arguments in relay traces on ARM. --- dlls/ntdll/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/relay.c b/dlls/ntdll/relay.c index b3c4aea..81e1593 100644 --- a/dlls/ntdll/relay.c +++ b/dlls/ntdll/relay.c @@ -364,7 +364,8 @@ __ASM_GLOBAL_FUNC( call_entry_point, "cmp r3, #0\n\t" "beq 5f\n\t" "sub SP, SP, r3\n\t" - "bic SP, SP, #15\n\t" + "tst r1, #1\n\t" + "subeq SP, SP, #4\n\t" "1:\tsub r3, r3, #4\n\t" "ldr r0, [r2, r3]\n\t" "str r0, [SP, r3]\n\t"

1 0

Michael Stefaniuc : Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.".
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 621d9e444a14885830a1a87178f3d3cce47ab562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621d9e444a14885830a1a8717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 18 22:55:08 2013 +0100 Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.". This reverts commit 7959778d3f84680fcee2e0d43cfcd0e613d68242. This is not always the case on Windows. --- dlls/dsound/tests/dsound.c | 3 --- dlls/dsound/tests/dsound8.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0f199a4..ed17f2a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -642,9 +642,6 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0,FALSE,0); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a0b78e5..664ba0c 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -648,9 +648,6 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0);

1 0

Austin English : riched20: Make sure to load dll below 2GB address space.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: d50baaa1df6dd56b4e84b828785b54cae558d3d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d50baaa1df6dd56b4e84b8287… Author: Austin English <austinenglish(a)gmail.com> Date: Mon Feb 18 13:48:14 2013 -0600 riched20: Make sure to load dll below 2GB address space. --- dlls/riched20/Makefile.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/riched20/Makefile.in b/dlls/riched20/Makefile.in index 9975537..49ba7a1 100644 --- a/dlls/riched20/Makefile.in +++ b/dlls/riched20/Makefile.in @@ -1,6 +1,7 @@ MODULE = riched20.dll IMPORTLIB = riched20 IMPORTS = uuid ole32 oleaut32 imm32 user32 gdi32 +EXTRADLLFLAGS = -Wl,--image-base,0x7ac00000 C_SRCS = \ caret.c \

1 0

Matteo Bruni : wined3d: Make (wined3d_) surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 25d0d0876d290e1e803ce16ed9d96189ba5948e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d0d0876d290e1e803ce16ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:22 2013 +0100 wined3d: Make (wined3d_)surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE. --- dlls/d3d9/tests/visual.c | 11 +++-------- dlls/wined3d/surface.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d429c4..81926ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13411,14 +13411,9 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y); - if (i % 4 < 2) - todo_wine 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); - else - 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); + 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); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57527e4..51a7578 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1040,17 +1040,20 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE return TRUE; } -static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) +static void surface_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_rect(dst_rect)); + TRACE("device %p\n", device); + TRACE("src_surface %p, src_location %s, src_rect %s,\n", + src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect)); + TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", + dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1078,9 +1081,9 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(src_surface, src_location, NULL); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(dst_surface, dst_location, NULL); context = context_acquire(device, NULL); if (!context->valid) @@ -1092,12 +1095,12 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1404,8 +1407,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const return blitter->depth_fill(device, surface, rect, depth); } -static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect) +static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { struct wined3d_device *device = src_surface->resource.device; @@ -1414,9 +1417,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) return WINED3DERR_INVALIDCALL; - wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); + surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, + surface_modify_ds_location(dst_surface, dst_location, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); return WINED3D_OK; @@ -1612,7 +1615,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect))) return WINED3D_OK; } } @@ -6168,16 +6172,22 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == SFLAG_INTEXTURE) + if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } + else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE) + { + /* Already up to date, nothing to do. */ + return WINED3D_OK; + } else { - FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location)); return WINED3DERR_INVALIDCALL; } }

1 0

Matteo Bruni : wined3d: Add RESZ support.
by Alexandre Julliard 19 Feb '13

19 Feb '13

Module: wine Branch: master Commit: 5e28b0c9747369b752102e56b94e58a012b8cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e28b0c9747369b752102e56b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:23 2013 +0100 wined3d: Add RESZ support. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/utils.c | 11 +++++++++++ include/wine/wined3d.h | 3 +++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bbd27df..c7874ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2212,6 +2212,22 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } +static void resolve_depth_buffer(struct wined3d_state *state) +{ + struct wined3d_texture *texture = state->textures[0]; + struct wined3d_surface *depth_stencil, *surface; + + if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE + || !(texture->resource.format->flags & WINED3DFMT_FLAG_DEPTH)) + return; + surface = surface_from_resource(texture->sub_resources[0]); + depth_stencil = state->fb->depth_stencil; + if (!depth_stencil) + return; + + wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); +} + void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { @@ -2234,6 +2250,12 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); + + if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) + { + TRACE("RESZ multisampled depth buffer resolve triggered.\n"); + resolve_depth_buffer(&device->stateBlock->state); + } } DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4b29ec8..7c508ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -126,6 +126,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NULL, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, @@ -1712,6 +1713,15 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE; } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ + * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with + * RENDERTARGET usage. */ + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + { + idx = getFmtIdx(WINED3DFMT_RESZ); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET; + } + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { struct wined3d_format *format = &gl_info->formats[idx]; @@ -1975,6 +1985,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); + FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 723d938..378a46b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -245,6 +245,7 @@ enum wined3d_format_id WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), + WINED3DFMT_RESZ = WINEMAKEFOURCC('R','E','S','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), @@ -1216,6 +1217,8 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_RESZ_CODE 0x7fa05000 + /* dwDDFX */ /* arithmetic stretching along y axis */ #define WINEDDBLTFX_ARITHSTRETCHY 0x00000001

1 0