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

Piotr Caban : msvcp100: Add _Runtime_object class implementation.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 661791cb7ea3757655aeff4fb061ada27a88cecc URL: https://source.winehq.org/git/wine.git/?a=commit;h=661791cb7ea3757655aeff4f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Mar 8 14:20:55 2018 -0600 msvcp100: Add _Runtime_object class implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp100/msvcp100.spec | 10 +++++---- dlls/msvcp100/tests/misc.c | 36 ++++++++++++++++++++++++++++- dlls/msvcp110/msvcp110.spec | 12 +++++----- dlls/msvcp120/msvcp120.spec | 12 +++++----- dlls/msvcp120_app/msvcp120_app.spec | 12 +++++----- dlls/msvcp90/misc.c | 45 +++++++++++++++++++++++++++++++++++++ 6 files changed, 104 insertions(+), 23 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=661791cb7ea3757655ae…

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptShapeOpenType().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 8d08ff3745536da0fd6107f97325e0fd33528227 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8d08ff3745536da0fd6107f9… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Mar 7 11:14:44 2018 +0330 usp10: Use heap_calloc() in ScriptShapeOpenType(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 983eb83..52c7044 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -3188,8 +3188,9 @@ HRESULT WINAPI ScriptShapeOpenType( HDC hdc, SCRIPT_CACHE *psc, WCHAR *rChars; if ((hr = SHAPE_CheckFontForRequiredFeatures(hdc, (ScriptCache *)*psc, psa)) != S_OK) return hr; - rChars = heap_alloc(sizeof(WCHAR) * cChars); - if (!rChars) return E_OUTOFMEMORY; + if (!(rChars = heap_calloc(cChars, sizeof(*rChars)))) + return E_OUTOFMEMORY; + for (i = 0, g = 0, cluster = 0; i < cChars; i++) { int idx = i;

1 0

Henri Verbeet : usp10: Use heap_calloc() in ScriptStringAnalyse().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 15c47c16e0ff37ea8e2b566f932fe33b922d3c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=15c47c16e0ff37ea8e2b566f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:03 2018 +0330 usp10: Use heap_calloc() in ScriptStringAnalyse(). Note that this changes the allocation size of analysis->pItem. I believe that change to be correct. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/usp10/usp10.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/dlls/usp10/usp10.c b/dlls/usp10/usp10.c index 52c7044..cf42c93 100644 --- a/dlls/usp10/usp10.c +++ b/dlls/usp10/usp10.c @@ -2012,8 +2012,10 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (cString < 1 || !pString) return E_INVALIDARG; if ((dwFlags & SSA_GLYPHS) && !hdc) return E_PENDING; - if (!(analysis = heap_alloc_zero(sizeof(StringAnalysis)))) return E_OUTOFMEMORY; - if (!(analysis->pItem = heap_alloc_zero(num_items * sizeof(SCRIPT_ITEM) + 1))) goto error; + if (!(analysis = heap_alloc_zero(sizeof(*analysis)))) + return E_OUTOFMEMORY; + if (!(analysis->pItem = heap_calloc(num_items + 1, sizeof(*analysis->pItem)))) + goto error; /* FIXME: handle clipping */ analysis->clip_len = cString; @@ -2032,8 +2034,7 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_PASSWORD) { - iString = heap_alloc(sizeof(WCHAR)*cString); - if (!iString) + if (!(iString = heap_calloc(cString, sizeof(*iString)))) { hr = E_OUTOFMEMORY; goto error; @@ -2058,18 +2059,16 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_BREAK) { - if ((analysis->logattrs = heap_alloc(sizeof(SCRIPT_LOGATTR) * cString))) - { - for (i = 0; i < analysis->numItems; i++) - ScriptBreak(&((WCHAR *)pString)[analysis->pItem[i].iCharPos], - analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, - &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); - } - else + if (!(analysis->logattrs = heap_calloc(cString, sizeof(*analysis->logattrs)))) goto error; + + for (i = 0; i < analysis->numItems; ++i) + ScriptBreak(&((const WCHAR *)pString)[analysis->pItem[i].iCharPos], + analysis->pItem[i + 1].iCharPos - analysis->pItem[i].iCharPos, + &analysis->pItem[i].a, &analysis->logattrs[analysis->pItem[i].iCharPos]); } - if (!(analysis->logical2visual = heap_alloc_zero(sizeof(int) * analysis->numItems))) + if (!(analysis->logical2visual = heap_calloc(analysis->numItems, sizeof(*analysis->logical2visual)))) goto error; if (!(BidiLevel = heap_alloc_zero(analysis->numItems))) goto error; @@ -2077,7 +2076,8 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, if (dwFlags & SSA_GLYPHS) { int tab_x = 0; - if (!(analysis->glyphs = heap_alloc_zero(sizeof(StringGlyphs) * analysis->numItems))) + + if (!(analysis->glyphs = heap_calloc(analysis->numItems, sizeof(*analysis->glyphs)))) { heap_free(BidiLevel); goto error; @@ -2088,11 +2088,11 @@ HRESULT WINAPI ScriptStringAnalyse(HDC hdc, const void *pString, int cString, SCRIPT_CACHE *sc = (SCRIPT_CACHE*)&analysis->glyphs[i].sc; int cChar = analysis->pItem[i+1].iCharPos - analysis->pItem[i].iCharPos; int numGlyphs = 1.5 * cChar + 16; - WORD *glyphs = heap_alloc_zero(sizeof(WORD) * numGlyphs); - WORD *pwLogClust = heap_alloc_zero(sizeof(WORD) * cChar); - int *piAdvance = heap_alloc_zero(sizeof(int) * numGlyphs); - SCRIPT_VISATTR *psva = heap_alloc_zero(sizeof(SCRIPT_VISATTR) * numGlyphs); - GOFFSET *pGoffset = heap_alloc_zero(sizeof(GOFFSET) * numGlyphs); + WORD *glyphs = heap_calloc(numGlyphs, sizeof(*glyphs)); + WORD *pwLogClust = heap_calloc(cChar, sizeof(*pwLogClust)); + int *piAdvance = heap_calloc(numGlyphs, sizeof(*piAdvance)); + SCRIPT_VISATTR *psva = heap_calloc(numGlyphs, sizeof(*psva)); + GOFFSET *pGoffset = heap_calloc(numGlyphs, sizeof(*pGoffset)); int numGlyphsReturned; HFONT originalFont = 0x0;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_blt_fbo().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: ca2aa71775c7ecf37ca186b5529049370fe2c912 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ca2aa71775c7ecf37ca186b5… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:52:59 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_blt_fbo(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 106 +++++++++++++++++++++++++++---------------------- 1 file changed, 59 insertions(+), 47 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ca2aa71775c7ecf37ca1…

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_download_data().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 4c1b3978ddfbf12383f0d0f0c9aaf13fac2d6b97 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c1b3978ddfbf12383f0d0f0… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:00 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5387737..5091bb8 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -560,11 +560,9 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win /* This call just downloads data, the caller is responsible for binding the * correct texture. */ /* Context activation is done by the caller. */ -static void surface_download_data(struct wined3d_surface *surface, const struct wined3d_gl_info *gl_info, - DWORD dst_location) +static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, + const struct wined3d_gl_info *gl_info, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; const struct wined3d_format *format = texture->resource.format; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; @@ -575,10 +573,11 @@ static void surface_download_data(struct wined3d_surface *surface, const struct GLenum target; void *mem; - /* Only support read back of converted P8 surfaces. */ + /* Only support read back of converted P8 textures. */ if (texture->flags & WINED3D_TEXTURE_CONVERTED && format->id != WINED3DFMT_P8_UINT && !format->download) { - ERR("Trying to read back converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + ERR("Trying to read back converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format->id)); return; } @@ -598,7 +597,7 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->flags & WINED3D_TEXTURE_COND_NP2_EMULATED) ERR("Array texture %p uses NP2 emulation.\n", texture); - WARN_(d3d_perf)("Downloading all miplevel layers to get the surface data for a single sub-resource.\n"); + WARN_(d3d_perf)("Downloading all miplevel layers to get the data for a single sub-resource.\n"); if (!(temporary_mem = heap_calloc(texture->layer_count, sub_resource->size))) { @@ -641,7 +640,8 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (data.buffer_object) ERR("Converted texture %p uses PBO unexpectedly.\n", texture); - WARN_(d3d_perf)("Downloading converted surface %p with format %s.\n", surface, debug_d3dformat(format->id)); + WARN_(d3d_perf)("Downloading converted texture %p, %u with format %s.\n", + texture, sub_resource_idx, debug_d3dformat(format->id)); f = *format; f.byte_count = format->conv_byte_count; @@ -675,16 +675,16 @@ static void surface_download_data(struct wined3d_surface *surface, const struct if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { - TRACE("Downloading compressed surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, level, format->glFormat, format->glType, mem); + TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format->glFormat, format->glType, mem); GL_EXTCALL(glGetCompressedTexImage(target, level, mem)); checkGLcall("glGetCompressedTexImage"); } else { - TRACE("Downloading surface %p, level %u, format %#x, type %#x, data %p.\n", - surface, level, format->glFormat, format->glType, mem); + TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", + texture, sub_resource_idx, level, format->glFormat, format->glType, mem); gl_info->gl_ops.gl.p_glGetTexImage(target, level, format->glFormat, format->glType, mem); checkGLcall("glGetTexImage"); @@ -2095,7 +2095,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - surface_download_data(sub_resource->u.surface, gl_info, dst_location); + texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location); ++texture->download_count; return TRUE;

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to surface_upload_from_surface().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: c337a46354b4b0c91c53573e0d28c152dd07a5f4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c337a46354b4b0c91c53573e… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:01 2018 +0330 wined3d: Pass a texture and sub-resource index to surface_upload_from_surface(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5091bb8..b7bb604 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -934,13 +934,10 @@ void wined3d_surface_upload_data(struct wined3d_texture *texture, unsigned int s } } -static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, const POINT *dst_point, - struct wined3d_surface *src_surface, const RECT *src_rect) +static HRESULT texture2d_upload_from_surface(struct wined3d_texture *dst_texture, + unsigned int dst_sub_resource_idx, const POINT *dst_point, struct wined3d_texture *src_texture, + unsigned int src_sub_resource_idx, const RECT *src_rect) { - unsigned int src_sub_resource_idx = surface_get_sub_resource_idx(src_surface); - unsigned int dst_sub_resource_idx = surface_get_sub_resource_idx(dst_surface); - struct wined3d_texture *src_texture = src_surface->container; - struct wined3d_texture *dst_texture = dst_surface->container; unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_gl_info *gl_info; unsigned int src_level, dst_level; @@ -948,16 +945,17 @@ static HRESULT surface_upload_from_surface(struct wined3d_surface *dst_surface, struct wined3d_bo_address data; UINT update_w, update_h; - TRACE("dst_surface %p, dst_point %s, src_surface %p, src_rect %s.\n", - dst_surface, wine_dbgstr_point(dst_point), - src_surface, wine_dbgstr_rect(src_rect)); + TRACE("dst_texture %p, dst_sub_resource_idx %u, dst_point %s, " + "src_texture %p, src_sub_resource_idx %u, src_rect %s.\n", + dst_texture, dst_sub_resource_idx, wine_dbgstr_point(dst_point), + src_texture, src_sub_resource_idx, wine_dbgstr_rect(src_rect)); context = context_acquire(dst_texture->resource.device, NULL, 0); gl_info = context->gl_info; - /* Only load the surface for partial updates. For newly allocated texture - * the texture wouldn't be the current location, and we'd upload zeroes - * just to overwrite them again. */ + /* Only load the sub-resource for partial updates. For newly allocated + * textures the texture wouldn't be the current location, and we'd upload + * zeroes just to overwrite them again. */ update_w = src_rect->right - src_rect->left; update_h = src_rect->bottom - src_rect->top; dst_level = dst_sub_resource_idx % dst_texture->level_count; @@ -3870,7 +3868,8 @@ HRESULT wined3d_surface_blt(struct wined3d_surface *dst_surface, const struct wi { POINT dst_point = {dst_box->left, dst_box->top}; - if (SUCCEEDED(surface_upload_from_surface(dst_surface, &dst_point, src_surface, &src_rect))) + if (SUCCEEDED(texture2d_upload_from_surface(dst_texture, dst_sub_resource_idx, + &dst_point, src_texture, src_sub_resource_idx, &src_rect))) { if (!wined3d_resource_is_offscreen(&dst_texture->resource)) {

1 0

Henri Verbeet : wined3d: Pass a texture and sub-resource index to read_from_framebuffer().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 40d5908854e5468cf070e26555b6e7158e1ef11e URL: https://source.winehq.org/git/wine.git/?a=commit;h=40d5908854e5468cf070e265… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Mar 8 10:53:02 2018 +0330 wined3d: Pass a texture and sub-resource index to read_from_framebuffer(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7bb604..12023e2 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1346,18 +1346,16 @@ static struct wined3d_texture *surface_convert_format(struct wined3d_texture *sr return dst_texture; } -static void read_from_framebuffer(struct wined3d_surface *surface, - struct wined3d_context *old_ctx, DWORD src_location, DWORD dst_location) +static void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned int sub_resource_idx, + struct wined3d_context *context, DWORD src_location, DWORD dst_location) { - unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); - struct wined3d_texture *texture = surface->container; struct wined3d_device *device = texture->resource.device; - struct wined3d_context *context = old_ctx; - struct wined3d_surface *restore_rt = NULL; + struct wined3d_texture *restore_texture; const struct wined3d_gl_info *gl_info; unsigned int row_pitch, slice_pitch; unsigned int width, height, level; struct wined3d_bo_address data; + unsigned int restore_idx; BYTE *row, *top, *bottom; BOOL src_is_upside_down; unsigned int i; @@ -1365,16 +1363,18 @@ static void read_from_framebuffer(struct wined3d_surface *surface, wined3d_texture_get_memory(texture, sub_resource_idx, &data, dst_location); - restore_rt = context_get_rt_surface(old_ctx); - if (restore_rt != surface) + restore_texture = context->current_rt.texture; + restore_idx = context->current_rt.sub_resource_idx; + if (restore_texture != texture || restore_idx != sub_resource_idx) context = context_acquire(device, texture, sub_resource_idx); else - restore_rt = NULL; + restore_texture = NULL; gl_info = context->gl_info; if (src_location != texture->resource.draw_binding) { - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, surface, NULL, src_location); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, + texture->sub_resources[sub_resource_idx].u.surface, NULL, src_location); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); } @@ -1468,8 +1468,8 @@ error: checkGLcall("glBindBuffer"); } - if (restore_rt) - context_restore(context, restore_rt); + if (restore_texture) + context_restore(context, restore_texture->sub_resources[restore_idx].u.surface); } /* Read the framebuffer contents into a texture. Note that this function @@ -2080,7 +2080,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (is_multisample_location(texture, WINED3D_LOCATION_TEXTURE_RGB)) { wined3d_texture_load_location(texture, sub_resource_idx, context, WINED3D_LOCATION_RB_RESOLVED); - read_from_framebuffer(sub_resource->u.surface, context, WINED3D_LOCATION_RB_RESOLVED, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + WINED3D_LOCATION_RB_RESOLVED, dst_location); return TRUE; } else @@ -2103,7 +2104,8 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res if (!(texture->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) && (sub_resource->locations & WINED3D_LOCATION_DRAWABLE)) { - read_from_framebuffer(sub_resource->u.surface, context, texture->resource.draw_binding, dst_location); + texture2d_read_from_framebuffer(texture, sub_resource_idx, context, + texture->resource.draw_binding, dst_location); return TRUE; }

1 0

Matteo Bruni : wined3d: Pass a wined3d_context structure to texture2d_download_data().
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: d2e89d0b99956b6314f1e1b9c06cd781bbbefa3b URL: https://source.winehq.org/git/wine.git/?a=commit;h=d2e89d0b99956b6314f1e1b9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 10:53:04 2018 +0330 wined3d: Pass a wined3d_context structure to texture2d_download_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 12023e2..35aee73 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -561,9 +561,10 @@ static BOOL fbo_blitter_supported(enum wined3d_blit_op blit_op, const struct win * correct texture. */ /* Context activation is done by the caller. */ static void texture2d_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - const struct wined3d_gl_info *gl_info, DWORD dst_location) + const struct wined3d_context *context, DWORD dst_location) { const struct wined3d_format *format = texture->resource.format; + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; unsigned int dst_row_pitch, dst_slice_pitch; unsigned int src_row_pitch, src_slice_pitch; @@ -2070,7 +2071,6 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD dst_location) { - const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture_sub_resource *sub_resource; sub_resource = &texture->sub_resources[sub_resource_idx]; @@ -2094,7 +2094,7 @@ BOOL texture2d_load_sysmem(struct wined3d_texture *texture, unsigned int sub_res { wined3d_texture_bind_and_dirtify(texture, context, !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); - texture2d_download_data(texture, sub_resource_idx, gl_info, dst_location); + texture2d_download_data(texture, sub_resource_idx, context, dst_location); ++texture->download_count; return TRUE;

1 0

Józef Kucia : wined3d: Allow blits from drawable location when loading renderbuffer locations.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: c114746f6f5601ec6c6a84b8a353868976509f5c URL: https://source.winehq.org/git/wine.git/?a=commit;h=c114746f6f5601ec6c6a84b8… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 8 16:55:25 2018 +0330 wined3d: Allow blits from drawable location when loading renderbuffer locations. Fixes a regression introduced by fb6b3cc872077e641cf68165e04012a95c94699d. 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/surface.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 35aee73..201a563 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2358,6 +2358,10 @@ BOOL texture2d_load_renderbuffer(struct wined3d_texture *texture, unsigned int s src_location = WINED3D_LOCATION_RB_RESOLVED; else if (locations & WINED3D_LOCATION_TEXTURE_SRGB) src_location = WINED3D_LOCATION_TEXTURE_SRGB; + else if (locations & WINED3D_LOCATION_TEXTURE_RGB) + src_location = WINED3D_LOCATION_TEXTURE_RGB; + else if (locations & WINED3D_LOCATION_DRAWABLE) + src_location = WINED3D_LOCATION_DRAWABLE; else /* texture2d_blt_fbo() will load the source location if necessary. */ src_location = WINED3D_LOCATION_TEXTURE_RGB;

1 0

Józef Kucia : d3d9/tests: Add test for readback from multisample front buffer.
by Alexandre Julliard 08 Mar '18

08 Mar '18

Module: wine Branch: master Commit: 57c2c9136fb07ecb8ab364eeab3e668bb5e5ba88 URL: https://source.winehq.org/git/wine.git/?a=commit;h=57c2c9136fb07ecb8ab364ee… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Mar 8 16:55:26 2018 +0330 d3d9/tests: Add test for readback from multisample front buffer. 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/d3d9/tests/visual.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 73 insertions(+) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 557631c..3686fc6 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -16249,6 +16249,78 @@ done: DestroyWindow(window); } +static void test_multisample_get_front_buffer_data(void) +{ + IDirect3DSwapChain9 *swapchain; + D3DPRESENT_PARAMETERS d3dpp; + IDirect3DSurface9 *readback; + IDirect3DTexture9 *texture; + IDirect3DDevice9 *device; + IDirect3D9 *d3d; + ULONG refcount; + HWND window; + DWORD color; + HRESULT hr; + + window = create_window(); + d3d = Direct3DCreate9(D3D_SDK_VERSION); + ok(!!d3d, "Failed to create D3D object.\n"); + if (FAILED(IDirect3D9_CheckDeviceMultiSampleType(d3d, D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, + D3DFMT_A8R8G8B8, TRUE, D3DMULTISAMPLE_2_SAMPLES, NULL))) + { + skip("Multisampling not supported for D3DFMT_A8R8G8B8.\n"); + goto done; + } + if (!(device = create_device(d3d, window, window, FALSE))) + { + skip("Failed to create D3D device.\n"); + goto done; + } + + hr = IDirect3DDevice9_GetSwapChain(device, 0, &swapchain); + ok(hr == D3D_OK, "Failed to get the implicit swapchain, hr %#x.\n", hr); + hr = IDirect3DSwapChain9_GetPresentParameters(swapchain, &d3dpp); + ok(hr == D3D_OK, "Failed to get present parameters, hr %#x.\n", hr); + IDirect3DSwapChain9_Release(swapchain); + d3dpp.MultiSampleType = D3DMULTISAMPLE_2_SAMPLES; + d3dpp.MultiSampleQuality = 0; + hr = IDirect3DDevice9_Reset(device, &d3dpp); + ok(hr == D3D_OK, "Failed to reset device, hr %#x.\n", hr); + + hr = IDirect3DDevice9_Clear(device, 0, NULL, D3DCLEAR_TARGET, 0x00f0ff0f, 0.0, 0); + ok(SUCCEEDED(hr), "Failed to clear render target, hr %#x.\n", hr); + hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); + ok(SUCCEEDED(hr), "Failed to present, hr %#x.\n", hr); + + hr = IDirect3DDevice9_CreateOffscreenPlainSurface(device, 640, 480, D3DFMT_A8R8G8B8, + D3DPOOL_SYSTEMMEM, &readback, NULL); + ok(SUCCEEDED(hr), "Failed to create readback surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + + hr = IDirect3DDevice9_CreateTexture(device, 640, 480, 1, + 0, D3DFMT_A8R8G8B8, D3DPOOL_SYSTEMMEM, &texture, NULL); + ok(SUCCEEDED(hr), "Failed to create texture, hr %#x.\n", hr); + + hr = IDirect3DTexture9_GetSurfaceLevel(texture, 0, &readback); + ok(SUCCEEDED(hr), "Failed to create surface, hr %#x.\n", hr); + hr = IDirect3DDevice9_GetFrontBufferData(device, 0, readback); + ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + color = getPixelColorFromSurface(readback, 320, 240); + ok(color == 0x00f0ff0f, "Got unexpected color 0x%08x.\n", color); + IDirect3DSurface9_Release(readback); + IDirect3DTexture9_Release(texture); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); +done: + IDirect3D9_Release(d3d); + DestroyWindow(window); +} + static void multisampled_depth_buffer_test(void) { IDirect3DDevice9 *device = 0; @@ -23839,6 +23911,7 @@ START_TEST(visual) srgbwrite_format_test(); update_surface_test(); multisample_get_rtdata_test(); + test_multisample_get_front_buffer_data(); zenable_test(); fog_special_test(); volume_srgb_test();

1 0