May 2016 - Wine-commits - list.winehq.org

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 596f7077971c2ca2abdc5f484b7f41bf4794a23b URL: http://source.winehq.org/git/wine.git/?a=commit;h=596f7077971c2ca2abdc5f484… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:52 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_set_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 26 ++++++++++++++------------ dlls/wined3d/stateblock.c | 2 +- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 8f46fcd..bfbee07 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3142,7 +3142,8 @@ static HRESULT WINAPI d3d9_device_SetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_set_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_set_ps_consts_i(device->wined3d_device, + reg_idx, count, (const struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 19e819c..1c25f1b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2648,26 +2648,28 @@ HRESULT CDECL wined3d_device_get_ps_consts_b(const struct wined3d_device *device } HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - UINT i; + unsigned int i; - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(&device->update_state->ps_consts_i[start_register], constants, count * sizeof(int) * 4); - for (i = 0; i < count; ++i) - TRACE("Set INT constant %u to {%d, %d, %d, %d}.\n", start_register + i, - constants[i * 4], constants[i * 4 + 1], - constants[i * 4 + 2], constants[i * 4 + 3]); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(&device->update_state->ps_consts_i[start_idx], constants, count * sizeof(*constants)); + if (TRACE_ON(d3d)) + { + for (i = 0; i < count; ++i) + TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); + } if (device->recording) { - for (i = start_register; i < count + start_register; ++i) + for (i = start_idx; i < count + start_idx; ++i) device->recording->changed.pixelShaderConstantsI |= (1u << i); } else diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index b648034..b76a5c0 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -928,7 +928,7 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) for (i = 0; i < stateblock->num_contained_ps_consts_i; ++i) { wined3d_device_set_ps_consts_i(device, stateblock->contained_ps_consts_i[i], - &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]].x, 1); + 1, &stateblock->state.ps_consts_i[stateblock->contained_ps_consts_i[i]]); } for (i = 0; i < stateblock->num_contained_ps_consts_b; ++i) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d81e065..4219b53 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -131,7 +131,7 @@ @ cdecl wined3d_device_set_ps_cb(ptr long ptr) @ cdecl wined3d_device_set_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_set_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_set_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_set_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_set_ps_resource_view(ptr long ptr) @ cdecl wined3d_device_set_ps_sampler(ptr long ptr) @ cdecl wined3d_device_set_render_state(ptr long long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 8ddf560..b01e8e4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2219,7 +2219,7 @@ HRESULT __cdecl wined3d_device_set_ps_consts_b(struct wined3d_device *device, HRESULT __cdecl wined3d_device_set_ps_consts_f(struct wined3d_device *device, unsigned int start_idx, unsigned int count, const struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_set_ps_consts_i(struct wined3d_device *device, - UINT start_register, const int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, const struct wined3d_ivec4 *constants); void __cdecl wined3d_device_set_ps_resource_view(struct wined3d_device *device, UINT idx, struct wined3d_shader_resource_view *view); void __cdecl wined3d_device_set_ps_sampler(struct wined3d_device *device, UINT idx, struct wined3d_sampler *sampler);

1 0

Henri Verbeet : wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: f69cf783df233e9ded04c4df193d39d1b465d424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f69cf783df233e9ded04c4df1… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:53 2016 +0200 wined3d: Pass wined3d_ivec4 structures to wined3d_device_get_ps_consts_i(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/device.c | 3 ++- dlls/wined3d/device.c | 14 +++++++------- dlls/wined3d/wined3d.spec | 2 +- include/wine/wined3d.h | 2 +- 4 files changed, 11 insertions(+), 10 deletions(-) diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index bfbee07..1938016 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -3158,7 +3158,8 @@ static HRESULT WINAPI d3d9_device_GetPixelShaderConstantI(IDirect3DDevice9Ex *if TRACE("iface %p, reg_idx %u, data %p, count %u.\n", iface, reg_idx, data, count); wined3d_mutex_lock(); - hr = wined3d_device_get_ps_consts_i(device->wined3d_device, reg_idx, data, count); + hr = wined3d_device_get_ps_consts_i(device->wined3d_device, + reg_idx, count, (struct wined3d_ivec4 *)data); wined3d_mutex_unlock(); return hr; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1c25f1b..d827528 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2681,17 +2681,17 @@ HRESULT CDECL wined3d_device_set_ps_consts_i(struct wined3d_device *device, } HRESULT CDECL wined3d_device_get_ps_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count) + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants) { - UINT count = min(vector4i_count, WINED3D_MAX_CONSTS_I - start_register); - - TRACE("device %p, start_register %u, constants %p, vector4i_count %u.\n", - device, start_register, constants, vector4i_count); + TRACE("device %p, start_idx %u, count %u, constants %p.\n", + device, start_idx, count, constants); - if (!constants || start_register >= WINED3D_MAX_CONSTS_I) + if (!constants || start_idx >= WINED3D_MAX_CONSTS_I) return WINED3DERR_INVALIDCALL; - memcpy(constants, &device->state.ps_consts_i[start_register], count * sizeof(int) * 4); + if (count > WINED3D_MAX_CONSTS_I - start_idx) + count = WINED3D_MAX_CONSTS_I - start_idx; + memcpy(constants, &device->state.ps_consts_i[start_idx], count * sizeof(*constants)); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 4219b53..c4446b8 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -72,7 +72,7 @@ @ cdecl wined3d_device_get_ps_cb(ptr long) @ cdecl wined3d_device_get_ps_consts_b(ptr long ptr long) @ cdecl wined3d_device_get_ps_consts_f(ptr long long ptr) -@ cdecl wined3d_device_get_ps_consts_i(ptr long ptr long) +@ cdecl wined3d_device_get_ps_consts_i(ptr long long ptr) @ cdecl wined3d_device_get_ps_resource_view(ptr long) @ cdecl wined3d_device_get_ps_sampler(ptr long) @ cdecl wined3d_device_get_raster_status(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index b01e8e4..af320a4 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2127,7 +2127,7 @@ HRESULT __cdecl wined3d_device_get_ps_consts_b(const struct wined3d_device *devi HRESULT __cdecl wined3d_device_get_ps_consts_f(const struct wined3d_device *device, unsigned int start_idx, unsigned int count, struct wined3d_vec4 *constants); HRESULT __cdecl wined3d_device_get_ps_consts_i(const struct wined3d_device *device, - UINT start_register, int *constants, UINT vector4i_count); + unsigned int start_idx, unsigned int count, struct wined3d_ivec4 *constants); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ps_resource_view(const struct wined3d_device *device, UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_ps_sampler(const struct wined3d_device *device, UINT idx);

1 0

Henri Verbeet : wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: abad305c1ae9a524e97eeaa05cf5f6d22dfe6f95 URL: http://source.winehq.org/git/wine.git/?a=commit;h=abad305c1ae9a524e97eeaa05… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 17 14:01:54 2016 +0200 wined3d: Emit position / attribute 0 last in draw_primitive_immediate_mode(). Emitting the position / attribute 0 provokes the actual vertex emission, so needs to happen last. This fixes a regression introduced by commit f3c155cc56eb31fa9294d388e755208a2633c398. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/drawprim.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index c086491..45fa524 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -214,9 +214,9 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const unsigned int element_idx; stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - for (element_idx = 0; use_map; use_map >>= 1, ++element_idx) + for (element_idx = MAX_ATTRIBS - 1; use_map; use_map &= ~(1u << element_idx), --element_idx) { - if (!(use_map & 1u)) + if (!(use_map & 1u << element_idx)) continue; ptr = si->elements[element_idx].data.addr + si->elements[element_idx].stride * stride_idx; @@ -329,12 +329,6 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const stride_idx = get_stride_idx(idx_data, idx_size, state->base_vertex_index, start_idx, vertex_idx); - if (position) - { - ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; - ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); - } - if (normal) { ptr = normal + stride_idx * si->elements[WINED3D_FFP_NORMAL].stride; @@ -379,6 +373,12 @@ static void draw_primitive_immediate_mode(struct wined3d_context *context, const ops->texcoord[si->elements[WINED3D_FFP_TEXCOORD0 + coord_idx].format->emit_idx]( GL_TEXTURE0_ARB + context->tex_unit_map[texture_idx], ptr); } + + if (position) + { + ptr = position + stride_idx * si->elements[WINED3D_FFP_POSITION].stride; + ops->position[si->elements[WINED3D_FFP_POSITION].format->emit_idx](ptr); + } } gl_info->gl_ops.gl.p_glEnd();

1 0

Stefan Dösinger : wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc().
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 3a7271655651f1af1323dfca58c6f2a5c6494675 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3a7271655651f1af1323dfca5… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:55 2016 +0200 wined3d: Use wined3d_texture_prepare_location() in wined3d_texture_update_desc(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 8 -------- dlls/wined3d/texture.c | 2 +- dlls/wined3d/wined3d_private.h | 2 -- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index e0d7c80..4fb2251 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4303,11 +4303,3 @@ cpu: return surface_cpu_blt(dst_texture, dst_sub_resource_idx, &dst_box, src_texture, src_sub_resource_idx, &src_box, flags, fx, filter); } - -/* Context activation is done by the caller. Context may be NULL in - * WINED3D_NO3D mode. */ -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) -{ - wined3d_texture_prepare_location(surface->container, - surface_get_sub_resource_idx(surface), context, location); -} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 53dbb2f..e0bb82f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1051,7 +1051,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT } else { - wined3d_surface_prepare(surface, NULL, WINED3D_LOCATION_SYSMEM); + wined3d_texture_prepare_location(texture, 0, NULL, WINED3D_LOCATION_SYSMEM); valid_location = WINED3D_LOCATION_SYSMEM; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c2f6471..bf43d75 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2713,8 +2713,6 @@ void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_modify_ds_location(struct wined3d_surface *surface, DWORD location, UINT w, UINT h) DECLSPEC_HIDDEN; -void wined3d_surface_prepare(struct wined3d_surface *surface, struct wined3d_context *context, - DWORD location) DECLSPEC_HIDDEN; void surface_set_compatible_renderbuffer(struct wined3d_surface *surface, const struct wined3d_surface *rt) DECLSPEC_HIDDEN; void surface_set_dirty(struct wined3d_surface *surface) DECLSPEC_HIDDEN;

1 0

Stefan Dösinger : wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: aa475ce23fa295a8f5d0fa120d7b3dac1a5a41b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=aa475ce23fa295a8f5d0fa120… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue May 17 14:01:56 2016 +0200 wined3d: Discard the backbuffer in swapchain_gl_present() with the "discard" swap effect. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index f982add..7368cda 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -606,6 +606,9 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, * The FLIP swap effect is not implemented yet. We could mark WINED3D_LOCATION_DRAWABLE * up to date and hope WGL flipped front and back buffers and read this data into * the FBO. Don't bother about this for now. */ + if (swapchain->desc.swap_effect == WINED3D_SWAP_EFFECT_DISCARD) + wined3d_texture_validate_location(swapchain->back_buffers[swapchain->desc.backbuffer_count - 1], + 0, WINED3D_LOCATION_DISCARDED); if (fb->depth_stencil) {

1 0

Andrey Gusev : comctl32/tests: Fix a typo in ok() call.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 7f0531cd407ecc89ce16ccdba530a7e7714817d7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7f0531cd407ecc89ce16ccdba… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Tue May 17 12:00:02 2016 +0300 comctl32/tests: Fix a typo in ok() call. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/comctl32/tests/tooltips.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/tests/tooltips.c b/dlls/comctl32/tests/tooltips.c index e94b2fd..422dd43 100644 --- a/dlls/comctl32/tests/tooltips.c +++ b/dlls/comctl32/tests/tooltips.c @@ -476,7 +476,7 @@ todo_wine toolinfoA.lpszText = bufA; r = SendMessageA(hwnd, TTM_GETTEXTA, 0, (LPARAM)&toolinfoA); ok(!r, "got %ld\n", r); - ok(!strcmp(toolinfoA.lpszText, testtip2A), "expected %s, got %s\n", testtipA, toolinfoA.lpszText); + ok(!strcmp(toolinfoA.lpszText, testtip2A), "expected %s, got %s\n", testtip2A, toolinfoA.lpszText); DestroyWindow(hwnd); }

1 0

Andrey Gusev : riched20: Fix a typo in TRACE() message.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 33c1a16a18c9ace0079f6569df49f1ecd83e0b63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=33c1a16a18c9ace0079f6569d… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Mon May 16 16:37:05 2016 +0300 riched20: Fix a typo in TRACE() message. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/caret.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/caret.c b/dlls/riched20/caret.c index 4b0bfcf..177f303 100644 --- a/dlls/riched20/caret.c +++ b/dlls/riched20/caret.c @@ -389,7 +389,7 @@ BOOL ME_InternalDeleteText(ME_TextEditor *editor, ME_Cursor *start, nCharsToDelete is a number of chars to delete from THIS run */ nChars -= nCharsToDelete; shift -= nCharsToDelete; - TRACE("Deleting %d (remaning %d) chars at %d in %s (%d)\n", + TRACE("Deleting %d (remaining %d) chars at %d in %s (%d)\n", nCharsToDelete, nChars, c.nOffset, debugstr_run( run ), run->len);

1 0

Francois Gouget : riched20/tests: Fix a spelling error in an editor comment.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 155eccd9c67b981e4f535aac6ed9a859268dbc37 URL: http://source.winehq.org/git/wine.git/?a=commit;h=155eccd9c67b981e4f535aac6… Author: Francois Gouget <fgouget(a)free.fr> Date: Sun May 15 15:32:50 2016 +0200 riched20/tests: Fix a spelling error in an editor comment. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/riched20/tests/editor.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/riched20/tests/editor.c b/dlls/riched20/tests/editor.c index 31d5128..fd00487 100644 --- a/dlls/riched20/tests/editor.c +++ b/dlls/riched20/tests/editor.c @@ -5046,7 +5046,7 @@ static void test_EM_REPLACESEL(int redraw) todo_wine ok(!strcmp(buffer, "WTestSomeTextne"), "WM_GETTEXT returned incorrect string\n"); if (!redraw) - /* This is needed to avoid interferring with keybd_event calls + /* This is needed to avoid interfering with keybd_event calls * on other tests that simulate keyboard events. */ SendMessageA(hwndRichEdit, WM_SETREDRAW, TRUE, 0);

1 0

Józef Kucia : d3d10core/tests: Check all sub-resources in check_texture_* functions.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: 938545c61c99280622509a6934ab5feba1946e34 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938545c61c99280622509a693… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:26 2016 +0200 d3d10core/tests: Check all sub-resources in check_texture_* functions. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 83 ++++++++++++++++++++++++++++++------------- 1 file changed, 58 insertions(+), 25 deletions(-) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index 8e69656..a4fa401 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -91,12 +91,14 @@ struct texture_readback { ID3D10Texture2D *texture; D3D10_MAPPED_TEXTURE2D mapped_texture; - unsigned int width, height; + unsigned int width, height, sub_resource_idx; }; -static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readback *rb) +static void get_texture_readback(ID3D10Texture2D *texture, unsigned int sub_resource_idx, + struct texture_readback *rb) { D3D10_TEXTURE2D_DESC texture_desc; + unsigned int miplevel; ID3D10Device *device; HRESULT hr; @@ -116,13 +118,16 @@ static void get_texture_readback(ID3D10Texture2D *texture, struct texture_readba return; } - rb->width = texture_desc.Width; - rb->height = texture_desc.Height; + miplevel = sub_resource_idx % texture_desc.MipLevels; + rb->width = max(1, texture_desc.Width >> miplevel); + rb->height = max(1, texture_desc.Height >> miplevel); + rb->sub_resource_idx = sub_resource_idx; ID3D10Device_CopyResource(device, (ID3D10Resource *)rb->texture, (ID3D10Resource *)texture); - if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, 0, D3D10_MAP_READ, 0, &rb->mapped_texture))) + if (FAILED(hr = ID3D10Texture2D_Map(rb->texture, sub_resource_idx, + D3D10_MAP_READ, 0, &rb->mapped_texture))) { - trace("Failed to map texture, hr %#x.\n", hr); + trace("Failed to map sub-resource %u, hr %#x.\n", sub_resource_idx, hr); ID3D10Texture2D_Release(rb->texture); rb->texture = NULL; } @@ -142,7 +147,7 @@ static float get_readback_float(struct texture_readback *rb, unsigned int x, uns static void release_texture_readback(struct texture_readback *rb) { - ID3D10Texture2D_Unmap(rb->texture, 0); + ID3D10Texture2D_Unmap(rb->texture, rb->sub_resource_idx); ID3D10Texture2D_Release(rb->texture); } @@ -151,23 +156,23 @@ static DWORD get_texture_color(ID3D10Texture2D *texture, unsigned int x, unsigne struct texture_readback rb; DWORD color; - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); color = get_readback_color(&rb, x, y); release_texture_readback(&rb); return color; } -#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) -static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, - DWORD expected_color, BYTE max_diff) +#define check_texture_sub_resource_color(t, s, c, d) check_texture_sub_resource_color_(__LINE__, t, s, c, d) +static void check_texture_sub_resource_color_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, DWORD expected_color, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; DWORD color = 0; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -184,19 +189,33 @@ static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected color 0x%08x at (%u, %u).\n", color, x, y); + "Got unexpected color 0x%08x at (%u, %u), sub-resource %u.\n", + color, x, y, sub_resource_idx); } -#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) -static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, - float expected_value, BYTE max_diff) +#define check_texture_color(t, c, d) check_texture_color_(__LINE__, t, c, d) +static void check_texture_color_(unsigned int line, ID3D10Texture2D *texture, + DWORD expected_color, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_color_(line, texture, sub_resource_idx, expected_color, max_diff); +} + +#define check_texture_sub_resource_float(r, s, f, d) check_texture_sub_resource_float_(__LINE__, r, s, f, d) +static void check_texture_sub_resource_float_(unsigned int line, ID3D10Texture2D *texture, + unsigned int sub_resource_idx, float expected_value, BYTE max_diff) { struct texture_readback rb; unsigned int x = 0, y = 0; BOOL all_match = TRUE; float value = 0.0f; - get_texture_readback(texture, &rb); + get_texture_readback(texture, sub_resource_idx, &rb); for (y = 0; y < rb.height; ++y) { for (x = 0; x < rb.width; ++x) @@ -213,7 +232,21 @@ static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, } release_texture_readback(&rb); ok_(__FILE__, line)(all_match, - "Got unexpected value %.8e at (%u, %u).\n", value, x, y); + "Got unexpected value %.8e at (%u, %u), sub-resource %u.\n", + value, x, y, sub_resource_idx); +} + +#define check_texture_float(r, f, d) check_texture_float_(__LINE__, r, f, d) +static void check_texture_float_(unsigned int line, ID3D10Texture2D *texture, + float expected_value, BYTE max_diff) +{ + unsigned int sub_resource_idx, sub_resource_count; + D3D10_TEXTURE2D_DESC texture_desc; + + ID3D10Texture2D_GetDesc(texture, &texture_desc); + sub_resource_count = texture_desc.ArraySize * texture_desc.MipLevels; + for (sub_resource_idx = 0; sub_resource_idx < sub_resource_count; ++sub_resource_idx) + check_texture_sub_resource_float_(line, texture, sub_resource_idx, expected_value, max_diff); } static ID3D10Device *create_device(void) @@ -4255,7 +4288,7 @@ static void test_texture(void) draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (y = 0; y < 4; ++y) { for (x = 0; x < 4; ++x) @@ -5121,7 +5154,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, &box, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5137,7 +5170,7 @@ static void test_update_subresource(void) ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)texture, 0, NULL, bitmap_data, 4 * sizeof(*bitmap_data), 0); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5321,7 +5354,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5337,7 +5370,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_texture, 0, 0, 0, 0, (ID3D10Resource *)src_texture, 0, NULL); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -5419,7 +5452,7 @@ static void test_copy_subresource_region(void) ID3D10Device_CopySubresourceRegion(device, (ID3D10Resource *)dst_buffer, 0, 0, 0, 0, (ID3D10Resource *)src_buffer, 0, &box); draw_quad(&test_context); - get_texture_readback(test_context.backbuffer, &rb); + get_texture_readback(test_context.backbuffer, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j) @@ -6402,7 +6435,7 @@ static void test_draw_depth_only(void) draw_quad(&test_context); } } - get_texture_readback(texture, &rb); + get_texture_readback(texture, 0, &rb); for (i = 0; i < 4; ++i) { for (j = 0; j < 4; ++j)

1 0

Józef Kucia : d3d10core/tests: Add tests for 2D texture RTVs.
by Alexandre Julliard 17 May '16

17 May '16

Module: wine Branch: master Commit: ae78672d2515e1486fdae13553427917a8c4d211 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae78672d2515e1486fdae1355… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 13 13:55:27 2016 +0200 d3d10core/tests: Add tests for 2D texture RTVs. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d10core/tests/device.c | 187 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 187 insertions(+) diff --git a/dlls/d3d10core/tests/device.c b/dlls/d3d10core/tests/device.c index a4fa401..7c66fe2 100644 --- a/dlls/d3d10core/tests/device.c +++ b/dlls/d3d10core/tests/device.c @@ -16,6 +16,7 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA */ +#include <assert.h> #define COBJMACROS #include "initguid.h" #include "d3d11.h" @@ -356,6 +357,9 @@ struct d3d10core_test_context ID3D10InputLayout *input_layout; ID3D10VertexShader *vs; ID3D10Buffer *vb; + + ID3D10PixelShader *ps; + ID3D10Buffer *ps_cb; }; #define init_test_context(c) init_test_context_(__LINE__, c) @@ -405,6 +409,10 @@ static void release_test_context_(unsigned int line, struct d3d10core_test_conte ID3D10VertexShader_Release(context->vs); if (context->vb) ID3D10Buffer_Release(context->vb); + if (context->ps) + ID3D10PixelShader_Release(context->ps); + if (context->ps_cb) + ID3D10Buffer_Release(context->ps_cb); ID3D10RenderTargetView_Release(context->backbuffer_rtv); ID3D10Texture2D_Release(context->backbuffer); @@ -490,6 +498,57 @@ static void draw_quad_(unsigned int line, struct d3d10core_test_context *context ID3D10Device_Draw(context->device, 4, 0); } +#define draw_color_quad(c, color) draw_color_quad_(__LINE__, c, color) +static void draw_color_quad_(unsigned int line, struct d3d10core_test_context *context, const struct vec4 *color) +{ + static const DWORD ps_color_code[] = + { +#if 0 + float4 color; + + float4 main() : SV_TARGET + { + return color; + } +#endif + 0x43425844, 0x80f1c810, 0xdacbbc8b, 0xe07b133e, 0x3059cbfa, 0x00000001, 0x000000b8, 0x00000003, + 0x0000002c, 0x0000003c, 0x00000070, 0x4e475349, 0x00000008, 0x00000000, 0x00000008, 0x4e47534f, + 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, 0x00000003, 0x00000000, + 0x0000000f, 0x545f5653, 0x45475241, 0xabab0054, 0x52444853, 0x00000040, 0x00000040, 0x00000010, + 0x04000059, 0x00208e46, 0x00000000, 0x00000001, 0x03000065, 0x001020f2, 0x00000000, 0x06000036, + 0x001020f2, 0x00000000, 0x00208e46, 0x00000000, 0x00000000, 0x0100003e, + }; + + ID3D10Device *device = context->device; + D3D10_BUFFER_DESC buffer_desc; + HRESULT hr; + + if (!context->ps) + { + hr = ID3D10Device_CreatePixelShader(device, ps_color_code, sizeof(ps_color_code), &context->ps); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create pixel shader, hr %#x.\n", hr); + } + + if (!context->ps_cb) + { + buffer_desc.ByteWidth = sizeof(*color); + buffer_desc.Usage = D3D10_USAGE_DEFAULT; + buffer_desc.BindFlags = D3D10_BIND_CONSTANT_BUFFER; + buffer_desc.CPUAccessFlags = 0; + buffer_desc.MiscFlags = 0; + + hr = ID3D10Device_CreateBuffer(device, &buffer_desc, NULL, &context->ps_cb); + ok_(__FILE__, line)(SUCCEEDED(hr), "Failed to create constant buffer, hr %#x.\n", hr); + } + + ID3D10Device_PSSetShader(device, context->ps); + ID3D10Device_PSSetConstantBuffers(device, 0, 1, &context->ps_cb); + + ID3D10Device_UpdateSubresource(device, (ID3D10Resource *)context->ps_cb, 0, NULL, color, 0, 0); + + draw_quad_(line, context); +} + static void test_feature_level(void) { D3D_FEATURE_LEVEL feature_level; @@ -1469,6 +1528,133 @@ static void test_create_rendertarget_view(void) ok(!refcount, "Device has %u references left.\n", refcount); } +static void test_render_target_views(void) +{ + struct texture + { + UINT miplevel_count; + UINT array_size; + }; + struct rtv + { + DXGI_FORMAT format; + D3D10_RTV_DIMENSION dimension; + unsigned int miplevel_idx; + unsigned int layer_idx; + unsigned int layer_count; + }; + + static const struct vec4 red = {1.0f, 0.0f, 0.0f, 1.0f}; + static struct test + { + struct texture texture; + struct rtv rtv; + DWORD expected_colors[4]; + } + tests[] = + { + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 1}, + {0x00000000, 0xff0000ff}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000}}, + {{2, 1}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 2, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 3, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + {{1, 4}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 4}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2D, 0}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 0, 1}, + {0xff0000ff, 0x00000000, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 0, 1, 1}, + {0x00000000, 0x00000000, 0xff0000ff, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 0, 1}, + {0x00000000, 0xff0000ff, 0x00000000, 0x00000000}}, + {{2, 2}, {DXGI_FORMAT_UNKNOWN, D3D10_RTV_DIMENSION_TEXTURE2DARRAY, 1, 1, 1}, + {0x00000000, 0x00000000, 0x00000000, 0xff0000ff}}, + }; + + struct d3d10core_test_context test_context; + D3D10_RENDER_TARGET_VIEW_DESC rtv_desc; + D3D10_TEXTURE2D_DESC texture_desc; + ID3D10RenderTargetView *rtv; + ID3D10Texture2D *texture; + ID3D10Device *device; + unsigned int i, j; + HRESULT hr; + + if (!init_test_context(&test_context)) + return; + + device = test_context.device; + + texture_desc.Width = 32; + texture_desc.Height = 32; + texture_desc.Format = DXGI_FORMAT_R8G8B8A8_UNORM; + texture_desc.SampleDesc.Count = 1; + texture_desc.SampleDesc.Quality = 0; + texture_desc.Usage = D3D10_USAGE_DEFAULT; + texture_desc.BindFlags = D3D10_BIND_RENDER_TARGET; + texture_desc.CPUAccessFlags = 0; + texture_desc.MiscFlags = 0; + + for (i = 0; i < sizeof(tests) / sizeof(*tests); ++i) + { + const struct test *test = &tests[i]; + unsigned int sub_resource_count; + + texture_desc.MipLevels = test->texture.miplevel_count; + texture_desc.ArraySize = test->texture.array_size; + + hr = ID3D10Device_CreateTexture2D(device, &texture_desc, NULL, &texture); + ok(SUCCEEDED(hr), "Test %u: Failed to create texture, hr %#x.\n", i, hr); + + rtv_desc.Format = texture_desc.Format; + rtv_desc.ViewDimension = test->rtv.dimension; + if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2D) + { + U(rtv_desc).Texture2D.MipSlice = test->rtv.miplevel_idx; + } + else if (test->rtv.dimension == D3D10_RTV_DIMENSION_TEXTURE2DARRAY) + { + U(rtv_desc).Texture2DArray.MipSlice = test->rtv.miplevel_idx; + U(rtv_desc).Texture2DArray.FirstArraySlice = test->rtv.layer_idx; + U(rtv_desc).Texture2DArray.ArraySize = test->rtv.layer_count; + } + else + { + trace("Test %u: Unhandled view dimension %#x.\n", i, test->rtv.dimension); + } + + hr = ID3D10Device_CreateRenderTargetView(device, (ID3D10Resource *)texture, &rtv_desc, &rtv); + ok(SUCCEEDED(hr), "Test %u: Failed to create render target view, hr %#x.\n", i, hr); + + ID3D10Device_OMSetRenderTargets(device, 1, &rtv, NULL); + draw_color_quad(&test_context, &red); + + sub_resource_count = texture_desc.MipLevels * texture_desc.ArraySize; + assert(sub_resource_count <= sizeof(test->expected_colors) / sizeof(*test->expected_colors)); + for (j = 0; j < sub_resource_count; ++j) + check_texture_sub_resource_color(texture, j, test->expected_colors[j], 1); + + ID3D10RenderTargetView_Release(rtv); + ID3D10Texture2D_Release(texture); + } + + release_test_context(&test_context); +} + static void test_create_shader_resource_view(void) { D3D10_SHADER_RESOURCE_VIEW_DESC srv_desc; @@ -6471,6 +6657,7 @@ START_TEST(device) test_create_depthstencil_view(); test_depthstencil_view_interfaces(); test_create_rendertarget_view(); + test_render_target_views(); test_create_shader_resource_view(); test_create_shader(); test_create_sampler_state();

1 0