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

Matteo Bruni : d3d11/tests: Add a test for the default feature level selection.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 73c32df3834cdd8443af950a87abae5c221b730a URL: http://source.winehq.org/git/wine.git/?a=commit;h=73c32df3834cdd8443af950a8… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:23 2016 +0100 d3d11/tests: Add a test for the default feature level selection. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index f0ae840..321fc2c 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -411,6 +411,15 @@ static void draw_quad_(unsigned int line, struct d3d11_test_context *context) static void test_create_device(void) { + static const D3D_FEATURE_LEVEL default_feature_levels[] = + { + D3D_FEATURE_LEVEL_11_0, + D3D_FEATURE_LEVEL_10_1, + D3D_FEATURE_LEVEL_10_0, + D3D_FEATURE_LEVEL_9_3, + D3D_FEATURE_LEVEL_9_2, + D3D_FEATURE_LEVEL_9_1, + }; D3D_FEATURE_LEVEL feature_level, supported_feature_level; DXGI_SWAP_CHAIN_DESC swapchain_desc, obtained_desc; ID3D11DeviceContext *immediate_context; @@ -440,6 +449,13 @@ static void test_create_device(void) ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, default_feature_levels, + sizeof(default_feature_levels) / sizeof(default_feature_levels[0]), D3D11_SDK_VERSION, NULL, + &feature_level, NULL); + ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr); + ok(feature_level == supported_feature_level, "Got feature level %#x, expected %#x.\n", + feature_level, supported_feature_level); + hr = D3D11CreateDevice(NULL, D3D_DRIVER_TYPE_HARDWARE, NULL, 0, NULL, 0, D3D11_SDK_VERSION, NULL, NULL, &immediate_context); ok(SUCCEEDED(hr), "D3D11CreateDevice failed %#x.\n", hr);

1 0

Matteo Bruni : d3d11/tests: Test creating SM4 shaders on feature level 9.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 1c8983bf75b16f9b82eae72a13e6d5052a14ad0f URL: http://source.winehq.org/git/wine.git/?a=commit;h=1c8983bf75b16f9b82eae72a1… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Wed Mar 9 23:19:24 2016 +0100 d3d11/tests: Test creating SM4 shaders on feature level 9. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/tests/d3d11.c | 133 +++++++++++++++++++++++++---------------------- 1 file changed, 72 insertions(+), 61 deletions(-) diff --git a/dlls/d3d11/tests/d3d11.c b/dlls/d3d11/tests/d3d11.c index 321fc2c..c42286a 100644 --- a/dlls/d3d11/tests/d3d11.c +++ b/dlls/d3d11/tests/d3d11.c @@ -2031,86 +2031,97 @@ static void test_create_shader(void) ok(hr == E_INVALIDARG, "Created a SM4 vertex shader from a pixel shader source, hr %#x, feature level %#x.\n", hr, feature_level); - if (feature_level < D3D_FEATURE_LEVEL_10_0) - { - refcount = ID3D11Device_Release(device); - ok(!refcount, "Device has %u references left.\n", refcount); - continue; - } - - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateVertexShader(device, vs_4_0, sizeof(vs_4_0), NULL, &vs); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11VertexShader_GetDevice(vs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Vertex shader should implement ID3D10VertexShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11VertexShader_Release(vs); - ok(!refcount, "Vertex shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11VertexShader_GetDevice(vs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11VertexShader_QueryInterface(vs, &IID_ID3D10VertexShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Vertex shader should implement ID3D10VertexShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11VertexShader_Release(vs); + ok(!refcount, "Vertex shader has %u references left.\n", refcount); + } /* pixel shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreatePixelShader(device, ps_4_0, sizeof(ps_4_0), NULL, &ps); - ok(SUCCEEDED(hr), "Failed to create SM4 vertex shader, hr %#x, feature level %#x.\n", hr, feature_level); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 pixel shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11PixelShader_GetDevice(ps, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Pixel shader should implement ID3D10PixelShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11PixelShader_Release(ps); - ok(!refcount, "Pixel shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11PixelShader_GetDevice(ps, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11PixelShader_QueryInterface(ps, &IID_ID3D10PixelShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Pixel shader should implement ID3D10PixelShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11PixelShader_Release(ps); + ok(!refcount, "Pixel shader has %u references left.\n", refcount); + } /* geometry shader */ - expected_refcount = get_refcount((IUnknown *)device) + 1; + expected_refcount = get_refcount((IUnknown *)device) + (feature_level >= D3D_FEATURE_LEVEL_10_0); hr = ID3D11Device_CreateGeometryShader(device, gs_4_0, sizeof(gs_4_0), NULL, &gs); - ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x.\n", hr); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + ok(SUCCEEDED(hr), "Failed to create SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); + else + ok(hr == E_INVALIDARG, "Created a SM4 geometry shader, hr %#x, feature level %#x.\n", hr, feature_level); refcount = get_refcount((IUnknown *)device); ok(refcount >= expected_refcount, "Got unexpected refcount %u, expected >= %u.\n", refcount, expected_refcount); - tmp = NULL; - expected_refcount = refcount + 1; - ID3D11GeometryShader_GetDevice(gs, &tmp); - ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); - refcount = get_refcount((IUnknown *)device); - ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", - refcount, expected_refcount); - ID3D11Device_Release(tmp); - - hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); - ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, - "Geometry shader should implement ID3D10GeometryShader.\n"); - if (SUCCEEDED(hr)) IUnknown_Release(iface); - - refcount = ID3D11GeometryShader_Release(gs); - ok(!refcount, "Geometry shader has %u references left.\n", refcount); + if (feature_level >= D3D_FEATURE_LEVEL_10_0) + { + tmp = NULL; + expected_refcount = refcount + 1; + ID3D11GeometryShader_GetDevice(gs, &tmp); + ok(tmp == device, "Got unexpected device %p, expected %p.\n", tmp, device); + refcount = get_refcount((IUnknown *)device); + ok(refcount == expected_refcount, "Got unexpected refcount %u, expected %u.\n", + refcount, expected_refcount); + ID3D11Device_Release(tmp); + + hr = ID3D11GeometryShader_QueryInterface(gs, &IID_ID3D10GeometryShader, (void **)&iface); + ok(SUCCEEDED(hr) || broken(hr == E_NOINTERFACE) /* Not available on all Windows versions. */, + "Geometry shader should implement ID3D10GeometryShader.\n"); + if (SUCCEEDED(hr)) IUnknown_Release(iface); + + refcount = ID3D11GeometryShader_Release(gs); + ok(!refcount, "Geometry shader has %u references left.\n", refcount); + } refcount = ID3D11Device_Release(device); ok(!refcount, "Device has %u references left.\n", refcount);

1 0

Józef Kucia : wined3d: Simplify shader_glsl_append_imm_ivec().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: e09aa6fc9420ef3f2c311d6fa43fd0e685177856 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e09aa6fc9420ef3f2c311d6fa… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:46 2016 +0100 wined3d: Simplify shader_glsl_append_imm_ivec(). 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/wined3d/glsl_shader.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 85244c8..2970a95 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -323,26 +323,22 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co static void shader_glsl_append_imm_ivec(struct wined3d_string_buffer *buffer, const int *values, unsigned int size) { - const char *fmt = "%#x"; - char str[4][17] = {{0}}; int i; - if (1 > size || size > 4) + if (!size || size > 4) { ERR("Invalid vector size %u.\n", size); return; } - for (i = size - 1; i >= 0; --i) - { - sprintf(str[i], fmt, values[i]); - fmt = "%#x, "; - } + if (size > 1) + shader_addline(buffer, "ivec%u(", size); + + for (i = 0; i < size; ++i) + shader_addline(buffer, i ? ", %#x" : "%#x", values[i]); if (size > 1) - shader_addline(buffer, "ivec%u(%s%s%s%s)", size, str[0], str[1], str[2], str[3]); - else - shader_addline(buffer, str[0]); + shader_addline(buffer, ")"); } static const char *get_info_log_line(const char **ptr)

1 0

Józef Kucia : wined3d: Improve ERR() message in shader_glsl_get_sample_function().
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 4c355b1eb5fc5a2b849140b06079755702c26231 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4c355b1eb5fc5a2b849140b06… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 10 07:41:47 2016 +0100 wined3d: Improve ERR() message in shader_glsl_get_sample_function(). 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/wined3d/glsl_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 2970a95..136bd55 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -2743,7 +2743,7 @@ static void shader_glsl_get_sample_function(const struct wined3d_shader_context { static const DWORD texel_fetch_flags = WINED3D_GLSL_SAMPLE_LOAD | WINED3D_GLSL_SAMPLE_OFFSET; if (flags & ~texel_fetch_flags) - ERR("Unexpected flags for texelFetch %#x.\n", flags & ~texel_fetch_flags); + ERR("Unexpected flags %#x for texelFetch.\n", flags & ~texel_fetch_flags); base = "texelFetch"; type_part = "";

1 0

Henri Verbeet : wined3d: Keep track of the download count in the texture.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: bc24fbf6d64d23b1ab0961de3d5bb86a53cb3d79 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bc24fbf6d64d23b1ab0961de3… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:53 2016 +0100 wined3d: Keep track of the download count in the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 35 +++++++++-------------------------- dlls/wined3d/volume.c | 10 ++++++---- dlls/wined3d/wined3d_private.h | 6 ++---- 3 files changed, 17 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1bdeecf..487fd3f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -507,11 +507,10 @@ static void surface_prepare_system_memory(struct wined3d_surface *surface) static void surface_evict_sysmem(struct wined3d_surface *surface) { - /* In some conditions the surface memory must not be freed: - * WINED3D_TEXTURE_CONVERTED: Converting the data back would take too long - * WINED3D_TEXTURE_DYNAMIC_MAP: Avoid freeing the data for performance */ - if (surface->resource.map_count || surface->container->flags & (WINED3D_TEXTURE_CONVERTED - | WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_DYNAMIC_MAP)) + struct wined3d_texture *texture = surface->container; + + if (surface->resource.map_count || texture->download_count > MAXLOCKCOUNT + || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_PIN_SYSMEM)) return; wined3d_resource_free_sysmem(&surface->resource); @@ -1259,11 +1258,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct * standard texture with a non-power2 width instead of a texture boxed up to be a power2 texture. * * internally the texture is still stored in a boxed format so any references to textureName will - * get a boxed texture with width pow2width and not a texture of width resource.width. - * - * Performance should not be an issue, because applications normally do not lock the surfaces when - * rendering. If an app does, the WINED3D_TEXTURE_DYNAMIC_MAP flag will kick in and the memory copy - * won't be released, and doesn't have to be re-read. */ + * get a boxed texture with width pow2width and not a texture of width resource.width. */ src_data = mem; dst_data = data.addr; TRACE("Repacking the surface data from pitch %u to pitch %u.\n", src_row_pitch, dst_row_pitch); @@ -2169,21 +2164,6 @@ HRESULT wined3d_surface_map(struct wined3d_surface *surface, struct wined3d_map_ if (!(surface->resource.access_flags & WINED3D_RESOURCE_ACCESS_CPU)) WARN("Trying to lock unlockable surface.\n"); - /* Performance optimization: Count how often a surface is mapped, if it is - * mapped regularly do not throw away the system memory copy. This avoids - * the need to download the surface from OpenGL all the time. The surface - * is still downloaded if the OpenGL texture is changed. Note that this - * only really makes sense for managed textures.*/ - if (!(texture->flags & WINED3D_TEXTURE_DYNAMIC_MAP) - && surface->resource.map_binding == WINED3D_LOCATION_SYSMEM) - { - if (++surface->lockCount > MAXLOCKCOUNT) - { - TRACE("Surface is mapped regularly, not freeing the system memory copy any more.\n"); - texture->flags |= WINED3D_TEXTURE_DYNAMIC_MAP; - } - } - flags = wined3d_resource_sanitize_map_flags(&texture->resource, flags); if (device->d3d_initialized) @@ -3475,9 +3455,12 @@ static void surface_load_sysmem(struct wined3d_surface *surface, /* Download the surface to system memory. */ if (surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { - wined3d_texture_bind_and_dirtify(surface->container, context, + struct wined3d_texture *texture = surface->container; + + wined3d_texture_bind_and_dirtify(texture, context, !(surface->locations & WINED3D_LOCATION_TEXTURE_RGB)); surface_download_data(surface, gl_info, dst_location); + ++texture->download_count; return; } diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index f70b50b..6eb7622 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -234,11 +234,13 @@ static void wined3d_volume_srgb_transfer(struct wined3d_volume *volume, static BOOL wined3d_volume_can_evict(const struct wined3d_volume *volume) { - if (volume->resource.pool != WINED3D_POOL_MANAGED) + struct wined3d_texture *texture = volume->container; + + if (texture->resource.pool != WINED3D_POOL_MANAGED) return FALSE; - if (volume->download_count >= 10) + if (texture->download_count >= 10) return FALSE; - if (volume->resource.format->convert) + if (texture->resource.format->convert) return FALSE; return TRUE; @@ -324,8 +326,8 @@ static BOOL wined3d_volume_load_location(struct wined3d_volume *volume, else wined3d_texture_bind_and_dirtify(texture, context, TRUE); - volume->download_count++; wined3d_volume_download_data(volume, context, &data); + ++texture->download_count; } else { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 61cc3a3..64a4d88 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2352,8 +2352,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_SRGB_VALID 0x00000080 #define WINED3D_TEXTURE_CONVERTED 0x00000100 #define WINED3D_TEXTURE_PIN_SYSMEM 0x00000200 -#define WINED3D_TEXTURE_DYNAMIC_MAP 0x00000400 -#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000800 +#define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2365,6 +2364,7 @@ struct wined3d_texture struct wined3d_swapchain *swapchain; UINT layer_count; UINT level_count; + unsigned int download_count; float pow2_matrix[16]; UINT lod; enum wined3d_texture_filter_type filter_type; @@ -2457,7 +2457,6 @@ struct wined3d_volume DWORD locations; GLint texture_level; - DWORD download_count; }; static inline struct wined3d_volume *volume_from_resource(struct wined3d_resource *resource) @@ -2537,7 +2536,6 @@ struct wined3d_surface GLenum texture_target; unsigned int texture_level; unsigned int texture_layer; - int lockCount; /* For GetDC */ struct wined3d_surface_dib dib;

1 0

Henri Verbeet : wined3d: Introduce helpers functions to calculate texture level dimensions.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: 06b5114342deed6a28d8258e75ca102cd1f4ce1f URL: http://source.winehq.org/git/wine.git/?a=commit;h=06b5114342deed6a28d8258e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:54 2016 +0100 wined3d: Introduce helpers functions to calculate texture level dimensions. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 14 +++++++------- dlls/wined3d/wined3d_private.h | 18 ++++++++++++++++++ 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 3ac6f43..d0f1f91 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -532,8 +532,8 @@ void CDECL wined3d_texture_get_pitch(const struct wined3d_texture *texture, unsigned int level, unsigned int *row_pitch, unsigned int *slice_pitch) { const struct wined3d_resource *resource = &texture->resource; - unsigned int width = max(1, texture->resource.width >> level); - unsigned int height = max(1, texture->resource.height >> level); + unsigned int width = wined3d_texture_get_level_width(texture, level); + unsigned int height = wined3d_texture_get_level_height(texture, level); if (texture->row_pitch) { @@ -1322,8 +1322,8 @@ BOOL wined3d_texture_check_block_align(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) { const struct wined3d_format *format = texture->resource.format; - unsigned int height = max(1, texture->resource.height >> level); - unsigned int width = max(1, texture->resource.width >> level); + unsigned int height = wined3d_texture_get_level_height(texture, level); + unsigned int width = wined3d_texture_get_level_width(texture, level); unsigned int width_mask, height_mask; if ((box->left >= box->right) @@ -1709,9 +1709,9 @@ HRESULT CDECL wined3d_texture_get_sub_resource_desc(const struct wined3d_texture desc->pool = resource->pool; level_idx = sub_resource_idx % texture->level_count; - desc->width = max(1, resource->width >> level_idx); - desc->height = max(1, resource->height >> level_idx); - desc->depth = max(1, resource->depth >> level_idx); + desc->width = wined3d_texture_get_level_width(texture, level_idx); + desc->height = wined3d_texture_get_level_height(texture, level_idx); + desc->depth = wined3d_texture_get_level_depth(texture, level_idx); desc->size = texture->sub_resources[sub_resource_idx].resource->size; return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 64a4d88..57e6e3f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2414,6 +2414,24 @@ static inline struct gl_texture *wined3d_texture_get_gl_texture(struct wined3d_t return srgb ? &texture->texture_srgb : &texture->texture_rgb; } +static inline unsigned int wined3d_texture_get_level_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.width >> level); +} + +static inline unsigned int wined3d_texture_get_level_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.height >> level); +} + +static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->resource.depth >> level); +} + void wined3d_texture_apply_sampler_desc(struct wined3d_texture *texture, const struct wined3d_sampler_desc *sampler_desc, const struct wined3d_context *context) DECLSPEC_HIDDEN; void wined3d_texture_bind(struct wined3d_texture *texture,

1 0

Henri Verbeet : wined3d: Don't call surface_load_ds_location() directly.
by Alexandre Julliard 11 Mar '16

11 Mar '16

Module: wine Branch: master Commit: de8e151f6d97211d09abf3676758dd6885bbc63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=de8e151f6d97211d09abf3676… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 9 16:21:55 2016 +0100 wined3d: Don't call surface_load_ds_location() directly. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 6 ++++-- dlls/wined3d/wined3d_private.h | 2 -- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff16c9d..d032184 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -203,7 +203,7 @@ void device_switch_onscreen_ds(struct wined3d_device *device, { if (device->onscreen_depth_stencil) { - surface_load_ds_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); + surface_load_location(device->onscreen_depth_stencil, context, WINED3D_LOCATION_TEXTURE_RGB); surface_modify_ds_location(device->onscreen_depth_stencil, WINED3D_LOCATION_TEXTURE_RGB, device->onscreen_depth_stencil->ds_current_size.cx, @@ -280,7 +280,7 @@ static void prepare_ds_clear(struct wined3d_surface *ds, struct wined3d_context } /* Full load. */ - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); SetRect(out_rect, 0, 0, ds->ds_current_size.cx, ds->ds_current_size.cy); } diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 8941761..4771898 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -661,7 +661,7 @@ void draw_primitive(struct wined3d_device *device, UINT start_idx, UINT index_co IntersectRect(&r, &draw_rect, &current_rect); if (!EqualRect(&r, &draw_rect)) - surface_load_ds_location(ds, context, location); + surface_load_location(ds, context, location); else wined3d_surface_prepare(ds, context, location); } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 487fd3f..e375618 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3213,7 +3213,7 @@ void surface_modify_ds_location(struct wined3d_surface *surface, } /* Context activation is done by the caller. */ -void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) +static void surface_load_ds_location(struct wined3d_surface *surface, struct wined3d_context *context, DWORD location) { const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_device *device = surface->resource.device; @@ -3689,8 +3689,10 @@ HRESULT surface_load_location(struct wined3d_surface *surface, struct wined3d_co if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == WINED3D_LOCATION_TEXTURE_RGB + if ((location == WINED3D_LOCATION_TEXTURE_RGB && surface->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_DISCARDED)) + || (location == WINED3D_LOCATION_DRAWABLE + && surface->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_DISCARDED))) { surface_load_ds_location(surface, context, location); return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 57e6e3f..ecd37a0 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2604,8 +2604,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; void surface_load(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) DECLSPEC_HIDDEN; -void surface_load_ds_location(struct wined3d_surface *surface, - struct wined3d_context *context, DWORD location) DECLSPEC_HIDDEN; void surface_load_fb_texture(struct wined3d_surface *surface, BOOL srgb, struct wined3d_context *context) DECLSPEC_HIDDEN; HRESULT surface_load_location(struct wined3d_surface *surface,

1 0

André Hentschel : winemaker: Markup fixes in German translation.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 154d024f8db9017ddf9ca28f0022554ac919eb5c URL: http://source.winehq.org/git/wine.git/?a=commit;h=154d024f8db9017ddf9ca28f0… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Mar 8 21:51:10 2016 +0100 winemaker: Markup fixes in German translation. Signed-off-by: André Hentschel <nerv(a)dawncrow.de> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winemaker/winemaker.de.UTF-8.man.in | 83 +++++++++++++++---------------- 1 file changed, 41 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=154d024f8db9017ddf9ca…

1 0

Patrick Armstrong : bcrypt: Make BCryptHashData behave more like Windows with empty input.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: ce3921df33a5c90b7a9dd365fd58cc6712e59470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce3921df33a5c90b7a9dd365f… Author: Patrick Armstrong <pat(a)triplefox.com> Date: Tue Mar 8 20:42:45 2016 -0800 bcrypt: Make BCryptHashData behave more like Windows with empty input. Signed-off-by: Patrick Armstrong <pat(a)oldpatricka.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/bcrypt/bcrypt_main.c | 2 +- dlls/bcrypt/tests/bcrypt.c | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/bcrypt/bcrypt_main.c b/dlls/bcrypt/bcrypt_main.c index 957efdd..c919c1d 100644 --- a/dlls/bcrypt/bcrypt_main.c +++ b/dlls/bcrypt/bcrypt_main.c @@ -632,7 +632,7 @@ NTSTATUS WINAPI BCryptHashData( BCRYPT_HASH_HANDLE handle, UCHAR *input, ULONG s TRACE( "%p, %p, %u, %08x\n", handle, input, size, flags ); if (!hash || hash->hdr.magic != MAGIC_HASH) return STATUS_INVALID_HANDLE; - if (!input) return STATUS_INVALID_PARAMETER; + if (!input) return STATUS_SUCCESS; return hash_update( hash, input, size ); } diff --git a/dlls/bcrypt/tests/bcrypt.c b/dlls/bcrypt/tests/bcrypt.c index bcb287b..f1f0002 100644 --- a/dlls/bcrypt/tests/bcrypt.c +++ b/dlls/bcrypt/tests/bcrypt.c @@ -165,6 +165,9 @@ static void test_sha1(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -238,6 +241,9 @@ static void test_sha256(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -311,6 +317,9 @@ static void test_sha384(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -385,6 +394,9 @@ static void test_sha512(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret); @@ -458,6 +470,9 @@ static void test_md5(void) ok(ret == STATUS_SUCCESS, "got %08x\n", ret); ok(hash != NULL, "hash not set\n"); + ret = BCryptHashData(hash, NULL, 0, 0); + ok(ret == STATUS_SUCCESS, "got %08x\n", ret); + ret = BCryptHashData(hash, (UCHAR *)"test", sizeof("test"), 0); ok(ret == STATUS_SUCCESS, "got %08x\n", ret);

1 0

Huw Davies : gdi32: Generate EMR_POLYPOLY{LINE|GON}16 records if the co-ords fit.
by Alexandre Julliard 09 Mar '16

09 Mar '16

Module: wine Branch: master Commit: 2e4a37f2cf16bdb4b7e958046eb498d3fc18e83e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2e4a37f2cf16bdb4b7e958046… Author: Huw Davies <huw(a)codeweavers.com> Date: Wed Mar 9 11:17:03 2016 +0000 gdi32: Generate EMR_POLYPOLY{LINE|GON}16 records if the co-ords fit. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/graphics.c | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index cf44e9c..83f822a 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -482,11 +482,11 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po DWORD iType) { EMRPOLYPOLYLINE *emr; - DWORD cptl = 0, poly, size; + DWORD cptl = 0, poly, size, i; INT point; RECTL bounds; const POINT *pts; - BOOL ret; + BOOL ret, use_small_emr = TRUE; bounds.left = bounds.right = pt[0].x; bounds.top = bounds.bottom = pt[0].y; @@ -495,6 +495,10 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po for(poly = 0; poly < polys; poly++) { cptl += counts[poly]; for(point = 0; point < counts[poly]; point++) { + /* check whether all points fit in the SHORT int POINT structure */ + if( ((pts->x+0x8000) & ~0xffff ) || + ((pts->y+0x8000) & ~0xffff ) ) + use_small_emr = FALSE; if(bounds.left > pts->x) bounds.left = pts->x; else if(bounds.right < pts->x) bounds.right = pts->x; if(bounds.top > pts->y) bounds.top = pts->y; @@ -503,18 +507,41 @@ EMFDRV_PolyPolylinegon( PHYSDEV dev, const POINT* pt, const INT* counts, UINT po } } - size = sizeof(EMRPOLYPOLYLINE) + (polys - 1) * sizeof(DWORD) + - (cptl - 1) * sizeof(POINTL); + size = FIELD_OFFSET(EMRPOLYPOLYLINE, aPolyCounts[polys]); + if(use_small_emr) + size += cptl * sizeof(POINTS); + else + size += cptl * sizeof(POINTL); emr = HeapAlloc( GetProcessHeap(), 0, size ); emr->emr.iType = iType; + if(use_small_emr) emr->emr.iType += EMR_POLYPOLYLINE16 - EMR_POLYPOLYLINE; + emr->emr.nSize = size; emr->rclBounds = bounds; emr->nPolys = polys; emr->cptl = cptl; - memcpy(emr->aPolyCounts, counts, polys * sizeof(DWORD)); - memcpy(emr->aPolyCounts + polys, pt, cptl * sizeof(POINTL)); + + if(polys) + { + memcpy( emr->aPolyCounts, counts, polys * sizeof(DWORD) ); + if(cptl) + { + if(use_small_emr) + { + POINTS *out_pts = (POINTS *)(emr->aPolyCounts + polys); + for(i = 0; i < cptl; i++ ) + { + out_pts[i].x = pt[i].x; + out_pts[i].y = pt[i].y; + } + } + else + memcpy( emr->aPolyCounts + polys, pt, cptl * sizeof(POINTL) ); + } + } + ret = EMFDRV_WriteRecord( dev, &emr->emr ); if(ret) EMFDRV_UpdateBBox( dev, &emr->rclBounds );

1 0