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

Henri Verbeet : wined3d: Introduce a helper function to map a wined3d_bo_address.
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: b08c430c510852e4edb41a51ace823408482c001 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b08c430c510852e4edb41a51a… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:45 2016 +0200 wined3d: Introduce a helper function to map a wined3d_bo_address. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 110 +++++++++++++++++++++++++------------------------ 1 file changed, 57 insertions(+), 53 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2ca94c0..50c5b2c 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -104,6 +104,47 @@ void wined3d_texture_invalidate_location(struct wined3d_texture *texture, sub_resource_idx, texture); } +/* Context activation is done by the caller. */ +static void *wined3d_texture_map_bo_address(const struct wined3d_bo_address *data, size_t size, + const struct wined3d_gl_info *gl_info, GLenum binding, DWORD flags) +{ + BYTE *memory; + + if (!data->buffer_object) + return data->addr; + + GL_EXTCALL(glBindBuffer(binding, data->buffer_object)); + + if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) + { + GLbitfield map_flags = wined3d_resource_gl_map_flags(flags) & ~GL_MAP_FLUSH_EXPLICIT_BIT; + memory = GL_EXTCALL(glMapBufferRange(binding, (INT_PTR)data->addr, size, map_flags)); + } + else + { + memory = GL_EXTCALL(glMapBuffer(binding, wined3d_resource_gl_legacy_map_flags(flags))); + memory += (INT_PTR)data->addr; + } + + GL_EXTCALL(glBindBuffer(binding, 0)); + checkGLcall("Map buffer object"); + + return memory; +} + +/* Context activation is done by the caller. */ +static void wined3d_texture_unmap_bo_address(const struct wined3d_bo_address *data, + const struct wined3d_gl_info *gl_info, GLenum binding) +{ + if (!data->buffer_object) + return; + + GL_EXTCALL(glBindBuffer(binding, data->buffer_object)); + GL_EXTCALL(glUnmapBuffer(binding)); + GL_EXTCALL(glBindBuffer(binding, 0)); + checkGLcall("Unmap buffer object"); +} + void wined3d_texture_get_memory(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_bo_address *data, DWORD locations) { @@ -1340,37 +1381,13 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour wined3d_texture_invalidate_location(texture, sub_resource_idx, ~sub_resource->resource->map_binding); wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->resource->map_binding); - if (!data.buffer_object) - { - base_memory = data.addr; - } - else - { - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, data.buffer_object)); - - if (gl_info->supported[ARB_MAP_BUFFER_RANGE]) - { - GLbitfield map_flags = wined3d_resource_gl_map_flags(flags); - map_flags &= ~GL_MAP_FLUSH_EXPLICIT_BIT; - base_memory = GL_EXTCALL(glMapBufferRange(GL_PIXEL_UNPACK_BUFFER, - (INT_PTR)data.addr, sub_resource->resource->size, map_flags)); - } - else - { - GLenum access = wined3d_resource_gl_legacy_map_flags(flags); - base_memory = GL_EXTCALL(glMapBuffer(GL_PIXEL_UNPACK_BUFFER, access)); - base_memory += (INT_PTR)data.addr; - } - - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("Map PBO"); - } + base_memory = wined3d_texture_map_bo_address(&data, sub_resource->resource->size, + gl_info, GL_PIXEL_UNPACK_BUFFER, flags); + TRACE("Base memory pointer %p.\n", base_memory); if (context) context_release(context); - TRACE("Base memory pointer %p.\n", base_memory); - if (fmt_flags & WINED3DFMT_FLAG_BROKEN_PITCH) { map_desc->row_pitch = wined3d_texture_get_level_width(texture, texture_level) * format->byte_count; @@ -1428,9 +1445,11 @@ static HRESULT texture_resource_sub_resource_map(struct wined3d_resource *resour static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *resource, unsigned int sub_resource_idx) { struct wined3d_texture_sub_resource *sub_resource; - const struct wined3d_gl_info *gl_info; + struct wined3d_device *device = resource->device; + const struct wined3d_gl_info *gl_info = NULL; + struct wined3d_context *context = NULL; struct wined3d_texture *texture; - struct wined3d_context *context; + struct wined3d_bo_address data; TRACE("resource %p, sub_resource_idx %u.\n", resource, sub_resource_idx); @@ -1446,36 +1465,21 @@ static HRESULT texture_resource_sub_resource_unmap(struct wined3d_resource *reso return WINEDDERR_NOTLOCKED; } - switch (sub_resource->resource->map_binding) + if (device->d3d_initialized) { - case WINED3D_LOCATION_SYSMEM: - case WINED3D_LOCATION_USER_MEMORY: - case WINED3D_LOCATION_DIB: - break; - - case WINED3D_LOCATION_BUFFER: - context = context_acquire(resource->device, NULL); - gl_info = context->gl_info; + context = context_acquire(device, NULL); + gl_info = context->gl_info; + } - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, - texture->sub_resources[sub_resource_idx].buffer_object)); - GL_EXTCALL(glUnmapBuffer(GL_PIXEL_UNPACK_BUFFER)); - GL_EXTCALL(glBindBuffer(GL_PIXEL_UNPACK_BUFFER, 0)); - checkGLcall("glUnmapBuffer"); - context_release(context); - break; + wined3d_texture_get_memory(texture, sub_resource_idx, &data, sub_resource->resource->map_binding); + wined3d_texture_unmap_bo_address(&data, gl_info, GL_PIXEL_UNPACK_BUFFER); - default: - ERR("Unexpected map binding %s.\n", wined3d_debug_location(sub_resource->resource->map_binding)); - break; - } + if (context) + context_release(context); if (texture->swapchain && texture->swapchain->front_buffer == texture) { - struct wined3d_surface *surface = texture->sub_resources[sub_resource_idx].u.surface; - - if (!(surface_get_sub_resource(surface)->locations - & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) + if (!(sub_resource->locations & (WINED3D_LOCATION_DRAWABLE | WINED3D_LOCATION_TEXTURE_RGB))) texture->swapchain->swapchain_ops->swapchain_frontbuffer_updated(texture->swapchain); } else if (resource->format_flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL))

1 0

Henri Verbeet : wined3d: Implement texture DC creation on top of D3DKMTCreateDCFromMemory().
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: 82a7f1ebf2979a3c6a4b6ca8fcc2679f2278f6e6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=82a7f1ebf2979a3c6a4b6ca8f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:46 2016 +0200 wined3d: Implement texture DC creation on top of D3DKMTCreateDCFromMemory(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 2 +- dlls/d3d9/tests/device.c | 2 +- dlls/ddraw/surface.c | 2 +- dlls/ddraw/tests/ddraw1.c | 2 +- dlls/ddraw/tests/ddraw2.c | 4 +- dlls/ddraw/tests/ddraw4.c | 4 +- dlls/ddraw/tests/ddraw7.c | 4 +- dlls/wined3d/palette.c | 5 -- dlls/wined3d/surface.c | 200 ++++++++++++++++------------------------- dlls/wined3d/swapchain.c | 45 +++------- dlls/wined3d/texture.c | 101 +++++++-------------- dlls/wined3d/utils.c | 42 ++++++--- dlls/wined3d/wined3d_private.h | 37 ++++---- 13 files changed, 180 insertions(+), 270 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=82a7f1ebf2979a3c6a4b6…

1 0

Henri Verbeet : wined3d: Track SFLAG_DISCARD per-texture.
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: 4896cda6c51370218eb32e6420e0b5dfacb5e6b1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4896cda6c51370218eb32e642… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:47 2016 +0200 wined3d: Track SFLAG_DISCARD per-texture. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 2 +- dlls/wined3d/surface.c | 3 --- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/texture.c | 2 ++ dlls/wined3d/wined3d_private.h | 6 +----- 5 files changed, 5 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 583f1e2..2e5a3a6 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -421,7 +421,7 @@ static void wined3d_cs_exec_set_depth_stencil_view(struct wined3d_cs *cs, const struct wined3d_surface *prev_surface = wined3d_rendertarget_view_get_surface(prev); if (prev_surface && (device->swapchains[0]->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL - || prev_surface->flags & SFLAG_DISCARD)) + || prev_surface->container->flags & WINED3D_TEXTURE_DISCARD)) { surface_modify_ds_location(prev_surface, WINED3D_LOCATION_DISCARDED, prev->width, prev->height); if (prev_surface == device->onscreen_depth_stencil) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9dfefe0..9b5a192 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4533,9 +4533,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex list_init(&surface->renderbuffers); list_init(&surface->overlays); - /* Flags */ - if (flags & WINED3D_TEXTURE_CREATE_DISCARD) - surface->flags |= SFLAG_DISCARD; if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index e9e6bfa..73b1673 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -616,7 +616,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, struct wined3d_surface *ds = wined3d_rendertarget_view_get_surface(fb->depth_stencil); if (ds && (swapchain->desc.flags & WINED3DPRESENTFLAG_DISCARD_DEPTHSTENCIL - || ds->flags & SFLAG_DISCARD)) + || ds->container->flags & WINED3D_TEXTURE_DISCARD)) { surface_modify_ds_location(ds, WINED3D_LOCATION_DISCARDED, fb->depth_stencil->width, fb->depth_stencil->height); diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 55d2a8e..2faaaa8 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -223,6 +223,8 @@ static HRESULT wined3d_texture_init(struct wined3d_texture *texture, const struc texture->flags |= WINED3D_TEXTURE_POW2_MAT_IDENT | WINED3D_TEXTURE_NORMALIZED_COORDS; if (flags & WINED3D_TEXTURE_CREATE_GET_DC_LENIENT) texture->flags |= WINED3D_TEXTURE_PIN_SYSMEM | WINED3D_TEXTURE_GET_DC_LENIENT; + if (flags & WINED3D_TEXTURE_CREATE_DISCARD) + texture->flags |= WINED3D_TEXTURE_DISCARD; return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6fd93e9..b69db4d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2445,6 +2445,7 @@ struct wined3d_texture_ops #define WINED3D_TEXTURE_NORMALIZED_COORDS 0x00000400 #define WINED3D_TEXTURE_GET_DC_LENIENT 0x00000800 #define WINED3D_TEXTURE_DC_IN_USE 0x00001000 +#define WINED3D_TEXTURE_DISCARD 0x00002000 #define WINED3D_TEXTURE_ASYNC_COLOR_KEY 0x00000001 @@ -2646,8 +2647,6 @@ struct wined3d_surface struct wined3d_resource resource; struct wined3d_texture *container; - DWORD flags; - UINT pow2Width; UINT pow2Height; GLuint rb_multisample; @@ -2734,9 +2733,6 @@ void wined3d_surface_upload_data(struct wined3d_surface *surface, const struct w void draw_textured_quad(const struct wined3d_surface *src_surface, struct wined3d_context *context, const RECT *src_rect, const RECT *dst_rect, enum wined3d_texture_filter_type filter) DECLSPEC_HIDDEN; -/* Surface flags: */ -#define SFLAG_DISCARD 0x00000002 /* ??? */ - struct wined3d_sampler { struct wine_rb_entry entry;

1 0

Henri Verbeet : wined3d: Check texture usage/pool/flags in texture_init().
by Alexandre Julliard 15 Apr '16

15 Apr '16

Module: wine Branch: master Commit: ecee205f6c20b7b877373ee60e9d5a28654da722 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ecee205f6c20b7b877373ee60… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 14 19:32:48 2016 +0200 wined3d: Check texture usage/pool/flags in texture_init(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 38 ++------------------------------------ dlls/wined3d/texture.c | 10 +++++++++- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 12 insertions(+), 38 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9b5a192..e5bc4d4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4469,48 +4469,16 @@ cpu: } HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, - const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer, DWORD flags) + const struct wined3d_resource_desc *desc, GLenum target, unsigned int level, unsigned int layer) { unsigned int sub_resource_idx = layer * container->level_count + level; struct wined3d_device *device = container->resource.device; const struct wined3d_gl_info *gl_info = &device->adapter->gl_info; const struct wined3d_format *format = wined3d_get_format(gl_info, desc->format); - BOOL lockable = flags & WINED3D_TEXTURE_CREATE_MAPPABLE; UINT multisample_quality = desc->multisample_quality; unsigned int resource_size; HRESULT hr; - /* Quick lockable sanity check. - * TODO: remove this after surfaces, usage and lockability have been debugged properly - * this function is too deep to need to care about things like this. - * Levels need to be checked too, since they all affect what can be done. */ - switch (desc->pool) - { - case WINED3D_POOL_MANAGED: - if (desc->usage & WINED3DUSAGE_DYNAMIC) - FIXME("Called with a pool of MANAGED and a usage of DYNAMIC which are mutually exclusive.\n"); - break; - - case WINED3D_POOL_DEFAULT: - if (lockable && !(desc->usage & (WINED3DUSAGE_DYNAMIC - | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL))) - WARN("Creating a lockable surface with a POOL of DEFAULT, that doesn't specify DYNAMIC usage.\n"); - break; - - case WINED3D_POOL_SCRATCH: - case WINED3D_POOL_SYSTEM_MEM: - break; - - default: - FIXME("Unknown pool %#x.\n", desc->pool); - break; - }; - - if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->pool != WINED3D_POOL_DEFAULT) - FIXME("Trying to create a render target that isn't in the default pool.\n"); - - /* FIXME: Check that the format is supported by the device. */ - resource_size = wined3d_format_calculate_size(format, device->surface_alignment, desc->width, desc->height, 1); if (!resource_size) return WINED3DERR_INVALIDCALL; @@ -4522,6 +4490,7 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex WARN("Failed to initialize resource, returning %#x.\n", hr); return hr; } + surface->resource.access_flags = container->resource.access_flags; surface->container = container; surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); @@ -4533,9 +4502,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex list_init(&surface->renderbuffers); list_init(&surface->overlays); - if (lockable || desc->format == WINED3DFMT_D16_LOCKABLE) - surface->resource.access_flags |= WINED3D_RESOURCE_ACCESS_CPU; - wined3d_texture_validate_location(container, sub_resource_idx, WINED3D_LOCATION_SYSMEM); if (container->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) container->sub_resources[sub_resource_idx].locations = WINED3D_LOCATION_DISCARDED; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 2faaaa8..52b026b 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1507,6 +1507,14 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3DERR_INVALIDCALL; } + if (desc->usage & WINED3DUSAGE_DYNAMIC && desc->pool == WINED3D_POOL_MANAGED) + FIXME("Trying to create a managed texture with dynamic usage.\n"); + if (!(desc->usage & (WINED3DUSAGE_DYNAMIC | WINED3DUSAGE_RENDERTARGET | WINED3DUSAGE_DEPTHSTENCIL)) + && (flags & WINED3D_TEXTURE_CREATE_MAPPABLE)) + WARN("Creating a mappable texture in the default pool that doesn't specify dynamic usage.\n"); + if (desc->usage & WINED3DUSAGE_RENDERTARGET && desc->pool != WINED3D_POOL_DEFAULT) + FIXME("Trying to create a render target that isn't in the default pool.\n"); + pow2_width = desc->width; pow2_height = desc->height; if (((desc->width & (desc->width - 1)) || (desc->height & (desc->height - 1))) @@ -1653,7 +1661,7 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 struct wined3d_surface *surface; surface = &surfaces[idx]; - if (FAILED(hr = wined3d_surface_init(surface, texture, &surface_desc, target, i, j, flags))) + if (FAILED(hr = wined3d_surface_init(surface, texture, &surface_desc, target, i, j))) { WARN("Failed to initialize surface, returning %#x.\n", hr); wined3d_texture_cleanup(texture); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b69db4d..7c3ea65 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2711,7 +2711,7 @@ void surface_get_drawable_size(const struct wined3d_surface *surface, const stru unsigned int *width, unsigned int *height) DECLSPEC_HIDDEN; HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_texture *container, const struct wined3d_resource_desc *desc, - GLenum target, unsigned int level, unsigned int layer, DWORD flags) DECLSPEC_HIDDEN; + GLenum target, unsigned int level, unsigned int layer) 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

Lauri Kenttä : po: Update Finnish translation.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: cd982d28f563d6ef768872a7f71967fa4115ebf4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd982d28f563d6ef768872a7f… Author: Lauri Kenttä <lauri.kentta(a)gmail.com> Date: Thu Apr 14 18:30:25 2016 +0300 po: Update Finnish translation. Signed-off-by: Lauri Kenttä <lauri.kentta(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/fi.po | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/po/fi.po b/po/fi.po index 2d9d8c9..2d357ab 100644 --- a/po/fi.po +++ b/po/fi.po @@ -11615,12 +11615,16 @@ msgid "" "reg: Unable to delete all registry values in '%1'. An unexpected error " "occurred.\n" msgstr "" +"reg: Kaikkien arvojen poistaminen kohteesta '%1' ei onnistu. Tapahtui " +"odottamaton virhe.\n" #: reg.rc:54 msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" msgstr "" +"reg: Määrätyn toiminnon suorittaminen ei onnistu. Tapahtui odottamaton " +"virhe.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Nikolay Sivov : po: Update Russian translation.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: ee9ae29a55b12b2c657f968fd3a958d72ecd7857 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee9ae29a55b12b2c657f968fd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 14 19:16:01 2016 +0300 po: Update Russian translation. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/ru.po | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/po/ru.po b/po/ru.po index fcebd98..b805219 100644 --- a/po/ru.po +++ b/po/ru.po @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: Wine\n" "Report-Msgid-Bugs-To: http://bugs.winehq.org\n" "POT-Creation-Date: N/A\n" -"PO-Revision-Date: 2016-04-05 11:31+0300\n" +"PO-Revision-Date: 2016-04-14 19:13+0300\n" "Last-Translator: Nikolay Sivov <nsivov(a)codeweavers.com>\n" "Language-Team: Russian\n" "Language: ru\n" @@ -11643,16 +11643,10 @@ msgstr "" "ошибка.\n" #: reg.rc:54 -#, fuzzy -#| msgid "" -#| "reg: Unable to delete all registry values in '%1'. An unexpected error " -#| "occurred.\n" msgid "" "reg: Unable to complete the specified operation. An unexpected error " "occurred.\n" -msgstr "" -"reg: не удалось удалить все значения в «%1». Произошла непредвиденная " -"ошибка.\n" +msgstr "reg: не удалось завершить операцию. Произошла непредвиденная ошибка.\n" #: regedit.rc:34 msgid "&Registry"

1 0

Henri Verbeet : wined3d: Use the texture dimension helpers in wined3d_volume_upload_data().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: d7e051902df31578af302dfbd743df199a52b575 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d7e051902df31578af302dfbd… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:51 2016 +0200 wined3d: Use the texture dimension helpers in wined3d_volume_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/volume.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index 02b5db6..cb60a24 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -79,9 +79,7 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = volume->container; const struct wined3d_format *format = texture->resource.format; - UINT width = volume->resource.width; - UINT height = volume->resource.height; - UINT depth = volume->resource.depth; + unsigned int width, height, depth; const void *mem = data->addr; void *converted_mem = NULL; @@ -89,6 +87,10 @@ void wined3d_volume_upload_data(struct wined3d_volume *volume, const struct wine volume, context, volume->texture_level, debug_d3dformat(format->id), format->id); + width = wined3d_texture_get_level_width(texture, volume->texture_level); + height = wined3d_texture_get_level_height(texture, volume->texture_level); + depth = wined3d_texture_get_level_depth(texture, volume->texture_level); + if (format->convert) { UINT dst_row_pitch, dst_slice_pitch;

1 0

Henri Verbeet : wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 64767de27798c79a91e9b3a93f2e8a14aadd258f URL: http://source.winehq.org/git/wine.git/?a=commit;h=64767de27798c79a91e9b3a93… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:52 2016 +0200 wined3d: Use the texture dimensions in swapchain_gdi_frontbuffer_updated(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index bada5fe..e5c7da6 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -682,9 +682,9 @@ static void swapchain_gdi_frontbuffer_updated(struct wined3d_swapchain *swapchai TRACE("offset %s.\n", wine_dbgstr_point(&offset)); draw_rect.left = 0; - draw_rect.right = front->resource.width; + draw_rect.right = swapchain->front_buffer->resource.width; draw_rect.top = 0; - draw_rect.bottom = front->resource.height; + draw_rect.bottom = swapchain->front_buffer->resource.height; IntersectRect(&draw_rect, &draw_rect, &swapchain->front_buffer_update); BitBlt(dst_dc, draw_rect.left - offset.x, draw_rect.top - offset.y,

1 0

Henri Verbeet : wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location().
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: fca93ef017262657f56aa72796a2fd6fe447d27f URL: http://source.winehq.org/git/wine.git/?a=commit;h=fca93ef017262657f56aa7279… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:53 2016 +0200 wined3d: Avoid wined3d_texture_get_sub_resource() in surface_load_ds_location(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b2e5081..cbaa14f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2836,7 +2836,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win /* Note that we use depth_blt here as well, rather than glCopyTexImage2D * directly on the FBO texture. That's because we need to flip. */ context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); if (surface->texture_target == GL_TEXTURE_RECTANGLE_ARB) { @@ -2882,7 +2882,7 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win TRACE("Copying depth texture to onscreen depth buffer.\n"); context_apply_fbo_state_blit(context, GL_FRAMEBUFFER, - wined3d_texture_get_sub_resource(context->swapchain->front_buffer, 0)->u.surface, + context->swapchain->front_buffer->sub_resources[0].u.surface, NULL, WINED3D_LOCATION_DRAWABLE); surface_depth_blt(surface, context, texture->texture_rgb.name, 0, surface->pow2Height - h, w, h, surface->texture_target);

1 0

Henri Verbeet : wined3d: Store the power-of-two dimensions in the texture.
by Alexandre Julliard 14 Apr '16

14 Apr '16

Module: wine Branch: master Commit: 1e0603eb58aaa3e28880bf82782619867ae441f5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1e0603eb58aaa3e28880bf827… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Apr 13 19:09:54 2016 +0200 wined3d: Store the power-of-two dimensions 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 | 21 ++------------------- dlls/wined3d/texture.c | 18 +++++++++++------- dlls/wined3d/wined3d_private.h | 14 ++++++++++++++ 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index cbaa14f..de82dda 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -4501,25 +4501,6 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex unsigned int resource_size; HRESULT hr; - if (container->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) - { - unsigned int pow2_width = 1, pow2_height = 1; - - /* Find the nearest pow2 match. */ - while (pow2_width < desc->width) - pow2_width <<= 1; - while (pow2_height < desc->height) - pow2_height <<= 1; - - surface->pow2Width = pow2_width; - surface->pow2Height = pow2_height; - } - else - { - surface->pow2Width = desc->width; - surface->pow2Height = desc->height; - } - /* Quick lockable sanity check. * TODO: remove this after surfaces, usage and lockability have been debugged properly * this function is too deep to need to care about things like this. @@ -4564,6 +4545,8 @@ HRESULT wined3d_surface_init(struct wined3d_surface *surface, struct wined3d_tex } surface->container = container; + surface->pow2Width = wined3d_texture_get_level_pow2_width(container, level); + surface->pow2Height = wined3d_texture_get_level_pow2_height(container, level); surface->texture_target = target; surface->texture_level = level; surface->texture_layer = layer; diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index e1d60cb..2ca94c0 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -899,18 +899,20 @@ HRESULT CDECL wined3d_texture_update_desc(struct wined3d_texture *texture, UINT && !gl_info->supported[ARB_TEXTURE_RECTANGLE] && !gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT]) { texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = surface->pow2Height = 1; - while (surface->pow2Width < width) - surface->pow2Width <<= 1; - while (surface->pow2Height < height) - surface->pow2Height <<= 1; + texture->pow2_width = texture->pow2_height = 1; + while (texture->pow2_width < width) + texture->pow2_width <<= 1; + while (texture->pow2_height < height) + texture->pow2_height <<= 1; } else { texture->flags &= ~WINED3D_TEXTURE_COND_NP2_EMULATED; - surface->pow2Width = width; - surface->pow2Height = height; + texture->pow2_width = width; + texture->pow2_height = height; } + surface->pow2Width = texture->pow2_width; + surface->pow2Height = texture->pow2_height; sub_resource->locations = 0; @@ -1556,6 +1558,8 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 texture->flags |= WINED3D_TEXTURE_COND_NP2_EMULATED; } } + texture->pow2_width = pow2_width; + texture->pow2_height = pow2_height; if ((pow2_width > gl_info->limits.texture_size || pow2_height > gl_info->limits.texture_size) && (desc->usage & WINED3DUSAGE_TEXTURE)) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 967f39e..d74f143 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2449,6 +2449,8 @@ struct wined3d_texture const struct wined3d_texture_ops *texture_ops; struct gl_texture texture_rgb, texture_srgb; struct wined3d_swapchain *swapchain; + unsigned int pow2_width; + unsigned int pow2_height; UINT layer_count; UINT level_count; unsigned int download_count; @@ -2521,6 +2523,18 @@ static inline unsigned int wined3d_texture_get_level_depth(const struct wined3d_ return max(1, texture->resource.depth >> level); } +static inline unsigned int wined3d_texture_get_level_pow2_width(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_width >> level); +} + +static inline unsigned int wined3d_texture_get_level_pow2_height(const struct wined3d_texture *texture, + unsigned int level) +{ + return max(1, texture->pow2_height >> 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