February 2016 - Wine-commits

Matteo Bruni : wined3d: Add shader limits for SM5.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 14d3dbbb7b967ce5ec2eb8a1cc2d9f892d174ffe URL: http://source.winehq.org/git/wine.git/?a=commit;h=14d3dbbb7b967ce5ec2eb8a1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue Feb 16 20:48:06 2016 +0100 wined3d: Add shader limits for SM5. 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/wined3d/shader.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index f577647..88c064c 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -487,12 +487,14 @@ static void shader_set_limits(struct wined3d_shader *shader) * shaders to 256. */ {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), { 4, 16, 256, 16, 12, 0}}, {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 16, 0}}, + {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 0}}, {0} }, gs_limits[] = { /* min_version, max_version, sampler, constant_int, constant_float, constant_bool, packed_output, packed_input */ {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 32, 16}}, + {WINED3D_SHADER_VERSION(5, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 32, 32}}, {0} }, ps_limits[] = @@ -503,7 +505,7 @@ static void shader_set_limits(struct wined3d_shader *shader) {WINED3D_SHADER_VERSION(2, 0), WINED3D_SHADER_VERSION(2, 0), {16, 0, 32, 0, 0, 0}}, {WINED3D_SHADER_VERSION(2, 1), WINED3D_SHADER_VERSION(2, 1), {16, 16, 32, 16, 0, 0}}, {WINED3D_SHADER_VERSION(3, 0), WINED3D_SHADER_VERSION(3, 0), {16, 16, 224, 16, 0, 12}}, - {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(4, 0), {16, 0, 0, 0, 0, 32}}, + {WINED3D_SHADER_VERSION(4, 0), WINED3D_SHADER_VERSION(5, 0), {16, 0, 0, 0, 0, 32}}, {0} }; const struct limits_entry *limits_array;

1 0

Alexandre Julliard : wininet/tests: Remove todo from a succeeding test.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 61d1c95ea40835b208d5f9c6b246230a189326b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=61d1c95ea40835b208d5f9c6b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Feb 18 02:03:22 2016 +0900 wininet/tests: Remove todo from a succeeding test. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wininet/tests/http.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/wininet/tests/http.c b/dlls/wininet/tests/http.c index 36710b7..82fd10b 100644 --- a/dlls/wininet/tests/http.c +++ b/dlls/wininet/tests/http.c @@ -216,8 +216,7 @@ static void _test_status_code(unsigned line, HINTERNET req, DWORD excode, BOOL i size = sizeof(code); res = HttpQueryInfoA(req, HTTP_QUERY_STATUS_CODE|HTTP_QUERY_FLAG_NUMBER, &code, &size, &index); ok_(__FILE__,line)(res, "[2] HttpQueryInfoA(HTTP_QUERY_STATUS_CODE|number index) failed: %u\n", GetLastError()); - todo_wine_if (is_todo) - ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); + ok_(__FILE__,line)(!index, "index = %d, expected 0\n", index); ok_(__FILE__,line)(size == sizeof(code), "size = %u\n", size); sprintf(exbuf, "%u", excode);

1 0

Charles Davis : gdi32: Declare our intent explicitly to the compiler.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: c94336f381f15a30905c0601c91df9b37934c683 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c94336f381f15a30905c0601c… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Wed Feb 17 02:27:04 2016 -0700 gdi32: Declare our intent explicitly to the compiler. Clang warns about this abs(3) call because the argument is of unsigned type. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/pen.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/pen.c b/dlls/gdi32/pen.c index 2ae2f2b..cf4b080 100644 --- a/dlls/gdi32/pen.c +++ b/dlls/gdi32/pen.c @@ -195,7 +195,7 @@ HPEN WINAPI ExtCreatePen( DWORD style, DWORD width, if (logbrush.lbStyle == BS_DIBPATTERN) logbrush.lbStyle = BS_DIBPATTERNPT; penPtr->logpen.elpPenStyle = style; - penPtr->logpen.elpWidth = abs(width); + penPtr->logpen.elpWidth = abs((int)width); penPtr->logpen.elpBrushStyle = logbrush.lbStyle; penPtr->logpen.elpColor = logbrush.lbColor; penPtr->logpen.elpHatch = brush->lbHatch;

1 0

Charles Davis : mscoree: Improve RuntimeHost_Invoke()' s error output a bit.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: c129cdf1455edc32bd112b3ed8a92125fc14d63b URL: http://source.winehq.org/git/wine.git/?a=commit;h=c129cdf1455edc32bd112b3ed… Author: Charles Davis <cdavis5x(a)gmail.com> Date: Tue Feb 16 00:03:58 2016 -0700 mscoree: Improve RuntimeHost_Invoke()'s error output a bit. Signed-off-by: Charles Davis <cdavis5x(a)gmail.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mscoree/corruntimehost.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/mscoree/corruntimehost.c b/dlls/mscoree/corruntimehost.c index 8c03875..820d786 100644 --- a/dlls/mscoree/corruntimehost.c +++ b/dlls/mscoree/corruntimehost.c @@ -206,28 +206,28 @@ static HRESULT RuntimeHost_Invoke(RuntimeHost *This, MonoDomain *domain, assembly = mono_domain_assembly_open(domain, assemblyname); if (!assembly) { - ERR("Cannot load assembly\n"); + ERR("Cannot load assembly %s\n", assemblyname); return E_FAIL; } image = mono_assembly_get_image(assembly); if (!image) { - ERR("Couldn't get assembly image\n"); + ERR("Couldn't get assembly image for %s\n", assemblyname); return E_FAIL; } klass = mono_class_from_name(image, namespace, typename); if (!klass) { - ERR("Couldn't get class from image\n"); + ERR("Couldn't get class %s.%s from image\n", namespace, typename); return E_FAIL; } method = mono_class_get_method_from_name(klass, methodname, arg_count); if (!method) { - ERR("Couldn't get method from class\n"); + ERR("Couldn't get method %s from class %s.%s\n", methodname, namespace, typename); return E_FAIL; } @@ -249,7 +249,7 @@ static HRESULT RuntimeHost_Invoke(RuntimeHost *This, MonoDomain *domain, } else hr = E_FAIL; - ERR("Method %s.%s raised an exception, hr=%x\n", namespace, typename, hr); + ERR("Method %s.%s:%s raised an exception, hr=%x\n", namespace, typename, methodname, hr); *result = NULL; return hr; }

1 0

Henri Verbeet : wined3d: Allocate the sub_resources array as part of the texture.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 273e4ae73766afc896d77f0c7fd68c5c43b7da85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=273e4ae73766afc896d77f0c7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:25 2016 +0100 wined3d: Allocate the sub_resources array as part of the texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 20 ++++++-------------- dlls/wined3d/wined3d_private.h | 3 ++- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b1f64f5..7563ae1 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -62,14 +62,6 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc wined3d_resource_update_draw_binding(&texture->resource); texture->texture_ops = texture_ops; - texture->sub_resources = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, - level_count * layer_count * sizeof(*texture->sub_resources)); - if (!texture->sub_resources) - { - ERR("Failed to allocate sub-resource array.\n"); - resource_cleanup(&texture->resource); - return E_OUTOFMEMORY; - } texture->layer_count = layer_count; texture->level_count = level_count; @@ -128,7 +120,6 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) } wined3d_texture_unload_gl_texture(texture); - HeapFree(GetProcessHeap(), 0, texture->sub_resources); resource_cleanup(&texture->resource); } @@ -977,10 +968,9 @@ static const struct wined3d_resource_ops texture2d_resource_ops = }; static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3d_resource_desc *desc, - UINT level_count, DWORD flags, struct wined3d_device *device, void *parent, - const struct wined3d_parent_ops *parent_ops) + unsigned int layer_count, unsigned int level_count, DWORD flags, struct wined3d_device *device, + void *parent, const struct wined3d_parent_ops *parent_ops) { - unsigned int layer_count = desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP ? 6 : 1; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; struct wined3d_resource_desc surface_desc; UINT pow2_width, pow2_height; @@ -1499,6 +1489,7 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) { + unsigned int layer_count = desc->usage & WINED3DUSAGE_LEGACY_CUBEMAP ? 6 : 1; struct wined3d_texture *object; HRESULT hr; @@ -1532,13 +1523,14 @@ HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct } } - if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*object)))) + if (!(object = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, + FIELD_OFFSET(struct wined3d_texture, sub_resources[level_count * layer_count])))) return E_OUTOFMEMORY; switch (desc->resource_type) { case WINED3D_RTYPE_TEXTURE_2D: - hr = texture_init(object, desc, level_count, flags, device, parent, parent_ops); + hr = texture_init(object, desc, layer_count, level_count, flags, device, parent, parent_ops); break; case WINED3D_RTYPE_TEXTURE_3D: diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 91f3fb0..48d44cd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2354,7 +2354,6 @@ struct wined3d_texture struct wined3d_resource resource; const struct wined3d_texture_ops *texture_ops; struct gl_texture texture_rgb, texture_srgb; - struct wined3d_resource **sub_resources; struct wined3d_swapchain *swapchain; UINT layer_count; UINT level_count; @@ -2382,6 +2381,8 @@ struct wined3d_texture struct wined3d_color_key gl_color_key; DWORD color_key_flags; } async; + + struct wined3d_resource *sub_resources[1]; }; static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined3d_resource *resource)

1 0

Stefan Dösinger : wined3d: Store texture sub-resources as structures containing resource pointers.
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 4f909e980fa4a3e462ea2f70cbb3b0d579510064 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4f909e980fa4a3e462ea2f70c… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 16 17:17:26 2016 +0100 wined3d: Store texture sub-resources as structures containing resource pointers. The idea being that the resource pointer will eventually go away. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 5 ++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 7563ae1..17a035f 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -113,7 +113,7 @@ static void wined3d_texture_cleanup(struct wined3d_texture *texture) for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; + struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; if (sub_resource) texture->texture_ops->texture_sub_resource_cleanup(sub_resource); @@ -457,7 +457,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, TRACE("Reloading because of color key value change.\n"); for (i = 0; i < sub_count; i++) - texture->texture_ops->texture_sub_resource_add_dirty_region(texture->sub_resources[i], NULL); + texture->texture_ops->texture_sub_resource_add_dirty_region(texture->sub_resources[i].resource, NULL); wined3d_texture_set_dirty(texture); texture->async.gl_color_key = texture->async.src_blt_color_key; @@ -472,7 +472,7 @@ void wined3d_texture_load(struct wined3d_texture *texture, /* Reload the surfaces if the texture is marked dirty. */ for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i], context, srgb); + texture->texture_ops->texture_sub_resource_load(texture->sub_resources[i].resource, context, srgb); } texture->flags |= flag; } @@ -639,7 +639,7 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT return WINED3DERR_INVALIDCALL; } - surface = surface_from_resource(texture->sub_resources[0]); + surface = surface_from_resource(texture->sub_resources[0].resource); if (surface->resource.map_count || (surface->flags & SFLAG_DCINUSE)) { WARN("Surface is mapped or the DC is in use.\n"); @@ -698,7 +698,7 @@ void wined3d_texture_force_reload(struct wined3d_texture *texture) texture->async.flags &= ~WINED3D_TEXTURE_ASYNC_COLOR_KEY; for (i = 0; i < sub_count; ++i) { - texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i], + texture->texture_ops->texture_sub_resource_invalidate_location(texture->sub_resources[i].resource, WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB); } } @@ -722,7 +722,7 @@ struct wined3d_resource * CDECL wined3d_texture_get_sub_resource(const struct wi return NULL; } - return texture->sub_resources[sub_resource_idx]; + return texture->sub_resources[sub_resource_idx].resource; } HRESULT CDECL wined3d_texture_add_dirty_region(struct wined3d_texture *texture, @@ -766,7 +766,7 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; + struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; texture->texture_ops->texture_sub_resource_upload_data(sub_resource, context, &data[i]); texture->texture_ops->texture_sub_resource_validate_location(sub_resource, WINED3D_LOCATION_TEXTURE_RGB); @@ -878,7 +878,7 @@ static void texture2d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i]); + struct wined3d_surface *surface = surface_from_resource(texture->sub_resources[i].resource); GLsizei height = surface->pow2Height; GLsizei width = surface->pow2Width; @@ -928,7 +928,7 @@ static void wined3d_texture_unload(struct wined3d_resource *resource) for (i = 0; i < sub_count; ++i) { - struct wined3d_resource *sub_resource = texture->sub_resources[i]; + struct wined3d_resource *sub_resource = texture->sub_resources[i].resource; sub_resource->resource_ops->resource_unload(sub_resource); } @@ -1108,7 +1108,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return hr; } - texture->sub_resources[idx] = &surface->resource; + texture->sub_resources[idx].resource = &surface->resource; TRACE("Created surface level %u @ %p.\n", i, surface); } /* Calculate the next mipmap level. */ @@ -1180,7 +1180,7 @@ static void texture3d_prepare_texture(struct wined3d_texture *texture, struct wi for (i = 0; i < sub_count; ++i) { - struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i]); + struct wined3d_volume *volume = volume_from_resource(texture->sub_resources[i].resource); GL_EXTCALL(glTexImage3D(GL_TEXTURE_3D, volume->texture_level, srgb ? format->glGammaInternal : format->glInternal, @@ -1324,7 +1324,7 @@ static HRESULT volumetexture_init(struct wined3d_texture *texture, const struct return hr; } - texture->sub_resources[i] = &volume->resource; + texture->sub_resources[i].resource = &volume->resource; /* Calculate the next mipmap level. */ volume_desc.width = max(1, volume_desc.width >> 1); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 48d44cd..a243727 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2382,7 +2382,10 @@ struct wined3d_texture DWORD color_key_flags; } async; - struct wined3d_resource *sub_resources[1]; + struct + { + struct wined3d_resource *resource; + } sub_resources[1]; }; static inline struct wined3d_texture *wined3d_texture_from_resource(struct wined3d_resource *resource)

1 0

Henri Verbeet : wined3d: Introduce wined3d_texture_get_sub_resource_parent ().
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 691086eac111b2558002d8d35c4ddec4afc3878e URL: http://source.winehq.org/git/wine.git/?a=commit;h=691086eac111b2558002d8d35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:27 2016 +0100 wined3d: Introduce wined3d_texture_get_sub_resource_parent(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 15 +++++++++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 17 insertions(+) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 17a035f..7a24ff0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1485,6 +1485,21 @@ HRESULT CDECL wined3d_texture_update_overlay(struct wined3d_texture *texture, un return WINED3D_OK; } +void * CDECL wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx) +{ + unsigned int sub_count = texture->level_count * texture->layer_count; + + TRACE("texture %p, sub_resource_idx %u.\n", texture, sub_resource_idx); + + if (sub_resource_idx >= sub_count) + { + WARN("sub_resource_idx %u >= sub_count %u.\n", sub_resource_idx, sub_count); + return NULL; + } + + return texture->sub_resources[sub_resource_idx].resource->parent; +} + HRESULT CDECL wined3d_texture_create(struct wined3d_device *device, const struct wined3d_resource_desc *desc, UINT level_count, DWORD flags, const struct wined3d_sub_resource_data *data, void *parent, const struct wined3d_parent_ops *parent_ops, struct wined3d_texture **texture) diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index 47eea42..c31ad7b 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -251,6 +251,7 @@ @ cdecl wined3d_texture_get_pitch(ptr long ptr ptr) @ cdecl wined3d_texture_get_resource(ptr) @ cdecl wined3d_texture_get_sub_resource(ptr long) +@ cdecl wined3d_texture_get_sub_resource_parent(ptr long) @ cdecl wined3d_texture_incref(ptr) @ cdecl wined3d_texture_preload(ptr) @ cdecl wined3d_texture_release_dc(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 555167a..44b54e0 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2447,6 +2447,7 @@ void __cdecl wined3d_texture_get_pitch(const struct wined3d_texture *texture, struct wined3d_resource * __cdecl wined3d_texture_get_resource(struct wined3d_texture *texture); struct wined3d_resource * __cdecl wined3d_texture_get_sub_resource(const struct wined3d_texture *texture, UINT sub_resource_idx); +void * __cdecl wined3d_texture_get_sub_resource_parent(struct wined3d_texture *texture, unsigned int sub_resource_idx); ULONG __cdecl wined3d_texture_incref(struct wined3d_texture *texture); void __cdecl wined3d_texture_preload(struct wined3d_texture *texture); HRESULT __cdecl wined3d_texture_release_dc(struct wined3d_texture *texture, unsigned int sub_resource_idx, HDC dc);

1 0

Henri Verbeet : ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create().
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: f984f56fd822cec2673edcacadbe39bd57959a63 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f984f56fd822cec2673edcaca… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:28 2016 +0100 ddraw: Use wined3d_texture_get_sub_resource_parent() in ddraw_surface_create(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ddraw/surface.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/dlls/ddraw/surface.c b/dlls/ddraw/surface.c index 4652c7b..a5b18a2 100644 --- a/dlls/ddraw/surface.c +++ b/dlls/ddraw/surface.c @@ -6116,8 +6116,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ return hr_ddraw_from_wined3d(hr); } - resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - root = wined3d_resource_get_parent(resource); + root = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); root->is_complex_root = TRUE; texture->root = root; @@ -6141,12 +6140,12 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ for (j = 0; j < levels; ++j) { - resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); - mip = wined3d_resource_get_parent(resource); + mip = wined3d_texture_get_sub_resource_parent(wined3d_texture, i * levels + j); mip_desc = &mip->surface_desc; if (j) { + resource = wined3d_texture_get_sub_resource(wined3d_texture, i * levels + j); wined3d_resource_get_desc(resource, &wined3d_mip_desc); mip_desc->dwWidth = wined3d_mip_desc.width; mip_desc->dwHeight = wined3d_mip_desc.height; @@ -6237,8 +6236,7 @@ HRESULT ddraw_surface_create(struct ddraw *ddraw, const DDSURFACEDESC2 *surface_ goto fail; } - resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - last = wined3d_resource_get_parent(resource); + last = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); wined3d_texture_decref(wined3d_texture); texture->root = last;

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_device_GetBackBuffer().
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: 1169794f83a36f7f76d04b52f713f6f2e971a883 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1169794f83a36f7f76d04b52f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:29 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_device_GetBackBuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index 9154ccb..d235cc5 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -723,7 +723,6 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, { struct d3d8_device *device = impl_from_IDirect3DDevice8(iface); struct wined3d_swapchain *wined3d_swapchain; - struct wined3d_resource *wined3d_resource; struct wined3d_texture *wined3d_texture; struct d3d8_surface *surface_impl; @@ -743,8 +742,7 @@ static HRESULT WINAPI d3d8_device_GetBackBuffer(IDirect3DDevice8 *iface, return D3DERR_INVALIDCALL; } - wined3d_resource = wined3d_texture_get_sub_resource(wined3d_texture, 0); - surface_impl = wined3d_resource_get_parent(wined3d_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(wined3d_texture, 0); *backbuffer = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*backbuffer);

1 0

Henri Verbeet : d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_device_create_surface().
by Alexandre Julliard 17 Feb '16

17 Feb '16

Module: wine Branch: master Commit: d772076aff58cfab92f51ce69f59b0e3b6c211dd URL: http://source.winehq.org/git/wine.git/?a=commit;h=d772076aff58cfab92f51ce69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Feb 16 17:17:30 2016 +0100 d3d8: Use wined3d_texture_get_sub_resource_parent() in d3d8_device_create_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/device.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dlls/d3d8/device.c b/dlls/d3d8/device.c index d235cc5..5bc39a6 100644 --- a/dlls/d3d8/device.c +++ b/dlls/d3d8/device.c @@ -937,7 +937,6 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width D3DFORMAT format, DWORD flags, IDirect3DSurface8 **surface, UINT usage, D3DPOOL pool, D3DMULTISAMPLE_TYPE multisample_type, DWORD multisample_quality) { - struct wined3d_resource *sub_resource; struct wined3d_resource_desc desc; struct d3d8_surface *surface_impl; struct wined3d_texture *texture; @@ -969,8 +968,7 @@ static HRESULT d3d8_device_create_surface(struct d3d8_device *device, UINT width return hr; } - sub_resource = wined3d_texture_get_sub_resource(texture, 0); - surface_impl = wined3d_resource_get_parent(sub_resource); + surface_impl = wined3d_texture_get_sub_resource_parent(texture, 0); surface_impl->parent_device = &device->IDirect3DDevice8_iface; *surface = &surface_impl->IDirect3DSurface8_iface; IDirect3DSurface8_AddRef(*surface);

1 0