wine-commits April 2016

wine-commits@winehq.org

2 participants
750 discussions

Daniel Lehman : msvcp90: Add codecvt<wchar_t>::do_encoding that returns 0.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: bd92393a5fbe7b65119cffa98144e5e60ac32eb6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bd92393a5fbe7b65119cffa98… Author: Daniel Lehman <dlehman(a)esri.com> Date: Mon Apr 4 21:08:12 2016 -0700 msvcp90: Add codecvt<wchar_t>::do_encoding that returns 0. Signed-off-by: Daniel Lehman <dlehman(a)esri.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 12 ++++++------ dlls/msvcp120/msvcp120.spec | 12 ++++++------ dlls/msvcp120_app/msvcp120_app.spec | 12 ++++++------ dlls/msvcp60/msvcp60.spec | 4 ++-- dlls/msvcp70/msvcp70.spec | 8 ++++---- dlls/msvcp71/msvcp71.spec | 8 ++++---- dlls/msvcp80/msvcp80.spec | 8 ++++---- dlls/msvcp90/locale.c | 19 +++++++++++++++++++ 8 files changed, 51 insertions(+), 32 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=bd92393a5fbe7b65119cf…

1 0

Huw Davies : gdi32: Implement playback of the GradientFill EMF record.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 66351b3de39cc835be52034c9e528cef93ac8492 URL: http://source.winehq.org/git/wine.git/?a=commit;h=66351b3de39cc835be52034c9… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 8 11:40:57 2016 +0100 gdi32: Implement playback of the GradientFill EMF record. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmetafile.c | 35 +++++++++++++++++++++-------------- 1 file changed, 21 insertions(+), 14 deletions(-) diff --git a/dlls/gdi32/enhmetafile.c b/dlls/gdi32/enhmetafile.c index 7fb0b34..995997c 100644 --- a/dlls/gdi32/enhmetafile.c +++ b/dlls/gdi32/enhmetafile.c @@ -2175,23 +2175,30 @@ BOOL WINAPI PlayEnhMetaFileRecord( break; } + case EMR_GRADIENTFILL: + { + EMRGRADIENTFILL *grad = (EMRGRADIENTFILL *)mr; + GdiGradientFill( hdc, grad->Ver, grad->nVer, grad->Ver + grad->nVer, + grad->nTri, grad->ulMode ); + break; + } + case EMR_POLYDRAW16: case EMR_GLSRECORD: case EMR_GLSBOUNDEDRECORD: - case EMR_DRAWESCAPE : - case EMR_EXTESCAPE: - case EMR_STARTDOC: - case EMR_SMALLTEXTOUT: - case EMR_FORCEUFIMAPPING: - case EMR_NAMEDESCAPE: - case EMR_COLORCORRECTPALETTE: - case EMR_SETICMPROFILEA: - case EMR_SETICMPROFILEW: - case EMR_TRANSPARENTBLT: - case EMR_GRADIENTFILL: - case EMR_SETLINKEDUFI: - case EMR_COLORMATCHTOTARGETW: - case EMR_CREATECOLORSPACEW: + case EMR_DRAWESCAPE: + case EMR_EXTESCAPE: + case EMR_STARTDOC: + case EMR_SMALLTEXTOUT: + case EMR_FORCEUFIMAPPING: + case EMR_NAMEDESCAPE: + case EMR_COLORCORRECTPALETTE: + case EMR_SETICMPROFILEA: + case EMR_SETICMPROFILEW: + case EMR_TRANSPARENTBLT: + case EMR_SETLINKEDUFI: + case EMR_COLORMATCHTOTARGETW: + case EMR_CREATECOLORSPACEW: default: /* From docs: If PlayEnhMetaFileRecord doesn't recognize a

1 0

Huw Davies : gdi32: Implement recording of the GradientFill EMF record.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: ac0959cdf63ab67269bd388df75555f1d83cfa86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac0959cdf63ab67269bd388df… Author: Huw Davies <huw(a)codeweavers.com> Date: Fri Apr 8 11:40:56 2016 +0100 gdi32: Implement recording of the GradientFill EMF record. Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/enhmfdrv/enhmetafiledrv.h | 2 + dlls/gdi32/enhmfdrv/graphics.c | 54 +++++++++++++++++++++++ dlls/gdi32/enhmfdrv/init.c | 2 +- dlls/gdi32/tests/metafile.c | 83 ++++++++++++++++++++++++++++++++++++ 4 files changed, 140 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h index cbd7368..721c82f 100644 --- a/dlls/gdi32/enhmfdrv/enhmetafiledrv.h +++ b/dlls/gdi32/enhmfdrv/enhmetafiledrv.h @@ -75,6 +75,8 @@ extern BOOL EMFDRV_FlattenPath( PHYSDEV dev ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_FrameRgn( PHYSDEV dev, HRGN hrgn, HBRUSH hbrush, INT width, INT height ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_GdiComment( PHYSDEV dev, UINT bytes, const BYTE *buffer ) DECLSPEC_HIDDEN; extern INT EMFDRV_GetDeviceCaps( PHYSDEV dev, INT cap ) DECLSPEC_HIDDEN; +extern BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) DECLSPEC_HIDDEN; extern INT EMFDRV_IntersectClipRect( PHYSDEV dev, INT left, INT top, INT right, INT bottom ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_InvertRgn( PHYSDEV dev, HRGN hrgn ) DECLSPEC_HIDDEN; extern BOOL EMFDRV_LineTo( PHYSDEV dev, INT x, INT y ) DECLSPEC_HIDDEN; diff --git a/dlls/gdi32/enhmfdrv/graphics.c b/dlls/gdi32/enhmfdrv/graphics.c index d3b3325..ae05378 100644 --- a/dlls/gdi32/enhmfdrv/graphics.c +++ b/dlls/gdi32/enhmfdrv/graphics.c @@ -855,3 +855,57 @@ no_bounds: HeapFree( GetProcessHeap(), 0, pemr ); return ret; } + +/********************************************************************** + * EMFDRV_GradientFill + */ +BOOL EMFDRV_GradientFill( PHYSDEV dev, TRIVERTEX *vert_array, ULONG nvert, + void *grad_array, ULONG ngrad, ULONG mode ) +{ + EMRGRADIENTFILL *emr; + ULONG i, pt, size, num_pts = ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); + const ULONG *pts = (const ULONG *)grad_array; + BOOL ret; + + size = FIELD_OFFSET(EMRGRADIENTFILL, Ver[nvert]) + num_pts * sizeof(pts[0]); + + emr = HeapAlloc( GetProcessHeap(), 0, size ); + if (!emr) return FALSE; + + for (i = 0; i < num_pts; i++) + { + pt = pts[i]; + + if (i == 0) + { + emr->rclBounds.left = emr->rclBounds.right = vert_array[pt].x; + emr->rclBounds.top = emr->rclBounds.bottom = vert_array[pt].y; + } + else + { + if (vert_array[pt].x < emr->rclBounds.left) + emr->rclBounds.left = vert_array[pt].x; + else if (vert_array[pt].x > emr->rclBounds.right) + emr->rclBounds.right = vert_array[pt].x; + if (vert_array[pt].y < emr->rclBounds.top) + emr->rclBounds.top = vert_array[pt].y; + else if (vert_array[pt].y > emr->rclBounds.bottom) + emr->rclBounds.bottom = vert_array[pt].y; + } + } + emr->rclBounds.right--; + emr->rclBounds.bottom--; + + emr->emr.iType = EMR_GRADIENTFILL; + emr->emr.nSize = size; + emr->nVer = nvert; + emr->nTri = ngrad; + emr->ulMode = mode; + memcpy( emr->Ver, vert_array, nvert * sizeof(vert_array[0]) ); + memcpy( emr->Ver + nvert, pts, num_pts * sizeof(pts[0]) ); + + EMFDRV_UpdateBBox( dev, &emr->rclBounds ); + ret = EMFDRV_WriteRecord( dev, &emr->emr ); + HeapFree( GetProcessHeap(), 0, emr ); + return ret; +} diff --git a/dlls/gdi32/enhmfdrv/init.c b/dlls/gdi32/enhmfdrv/init.c index 34b3de6..e0cbcae 100644 --- a/dlls/gdi32/enhmfdrv/init.c +++ b/dlls/gdi32/enhmfdrv/init.c @@ -92,7 +92,7 @@ static const struct gdi_dc_funcs EMFDRV_Funcs = NULL, /* pGetTextExtentExPointI */ NULL, /* pGetTextFace */ NULL, /* pGetTextMetrics */ - NULL, /* pGradientFill */ + EMFDRV_GradientFill, /* pGradientFill */ EMFDRV_IntersectClipRect, /* pIntersectClipRect */ EMFDRV_InvertRgn, /* pInvertRgn */ EMFDRV_LineTo, /* pLineTo */ diff --git a/dlls/gdi32/tests/metafile.c b/dlls/gdi32/tests/metafile.c index 5b3bd9f..68ac425 100644 --- a/dlls/gdi32/tests/metafile.c +++ b/dlls/gdi32/tests/metafile.c @@ -1424,6 +1424,44 @@ static const unsigned char EMF_POLYPOLYLINE_BITS[] = 0x14, 0x00, 0x00, 0x00 }; +static const unsigned char EMF_GRADIENTFILL_BITS[] = +{ + 0x01, 0x00, 0x00, 0x00, 0x6c, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x2b, 0x01, 0x00, 0x00, 0x35, 0x01, 0x00, 0x00, + 0x23, 0x00, 0x00, 0x00, 0x61, 0x01, 0x00, 0x00, + 0x31, 0x29, 0x00, 0x00, 0xa3, 0x2a, 0x00, 0x00, + 0x20, 0x45, 0x4d, 0x46, 0x00, 0x00, 0x01, 0x00, + 0x0c, 0x01, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x40, 0x05, 0x00, 0x00, 0x46, 0x03, 0x00, 0x00, + 0xda, 0x01, 0x00, 0x00, 0x28, 0x01, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x15, 0x3c, 0x07, 0x00, + 0xcb, 0x82, 0x04, 0x00, 0x76, 0x00, 0x00, 0x00, + 0x8c, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x0a, 0x00, 0x00, 0x00, 0x2b, 0x01, 0x00, 0x00, + 0x35, 0x01, 0x00, 0x00, 0x05, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x0a, 0x00, 0x00, 0x00, + 0x00, 0xff, 0x00, 0x80, 0x00, 0x00, 0x01, 0x80, + 0xc8, 0x00, 0x00, 0x00, 0xd2, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0xff, + 0xb4, 0x00, 0x00, 0x00, 0xbe, 0x00, 0x00, 0x00, + 0x34, 0x12, 0x78, 0x56, 0xbc, 0x9a, 0xf0, 0xde, + 0x2c, 0x01, 0x00, 0x00, 0x36, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x90, 0x01, 0x00, 0x00, 0x9a, 0x01, 0x00, 0x00, + 0x00, 0xff, 0x00, 0xff, 0x00, 0xff, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, + 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0e, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, + 0x14, 0x00, 0x00, 0x00 +}; + /* For debugging or dumping the raw metafiles produced by * new test functions. */ @@ -3599,6 +3637,50 @@ static void test_emf_PolyPolyline(void) DeleteEnhMetaFile(hemf); } +static void test_emf_GradientFill(void) +{ + HDC mf; + HENHMETAFILE hemf; + TRIVERTEX v[] = + { + { 1, 10, 0xff00, 0x8000, 0x0000, 0x8001 }, + { 200, 210, 0x0000, 0x0000, 0xff00, 0xff00 }, + { 180, 190, 0x1234, 0x5678, 0x9abc, 0xdef0 }, + { 300, 310, 0xff00, 0xff00, 0xff00, 0x0000 }, + { 400, 410, 0xff00, 0xff00, 0xff00, 0x0000 } + }; + GRADIENT_TRIANGLE tri[] = { { 0, 1, 2 }, { 3, 1, 0 } }; + BOOL ret; + + mf = CreateEnhMetaFileA( GetDC( 0 ), NULL, NULL, NULL ); + ok( mf != 0, "CreateEnhMetaFileA error %d\n", GetLastError() ); + + /* Don't test the GRADIENT_FILL_RECT_ modes since a Windows bug + * means it allocates three mesh indicies rather than two per + * rectangle. This results in uninitialised values being written + * to the EMF which is rather difficult to test against. + * + * Note also that the final vertex here is not required, yet it is + * written to the EMF, but is not considered in the bounds + * calculation. + */ + ret = GdiGradientFill( mf, v, sizeof(v) / sizeof(v[0]), tri, sizeof(tri) / sizeof(tri[0]), + GRADIENT_FILL_TRIANGLE ); + ok( ret, "GradientFill\n" ); + + hemf = CloseEnhMetaFile( mf ); + ok( hemf != 0, "CloseEnhMetaFile error %d\n", GetLastError() ); + + if (compare_emf_bits( hemf, EMF_GRADIENTFILL_BITS, sizeof(EMF_GRADIENTFILL_BITS), + "emf_GradientFill", FALSE ) != 0) + { + dump_emf_bits( hemf, "emf_GradientFill" ); + dump_emf_records( hemf, "emf_GradientFill" ); + } + + DeleteEnhMetaFile( hemf ); +} + START_TEST(metafile) { init_function_pointers(); @@ -3614,6 +3696,7 @@ START_TEST(metafile) test_emf_polybezier(); test_emf_GetPath(); test_emf_PolyPolyline(); + test_emf_GradientFill(); /* For win-format metafiles (mfdrv) */ test_mf_SaveDC();

1 0

Nikolay Sivov : gdi32: Increase first gdi handle value.
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: 4161f5120b59d916e1818748f0d0ced7c7a76303 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4161f5120b59d916e1818748f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Thu Apr 7 23:36:03 2016 +0300 gdi32: Increase first gdi handle value. Due to 32->16bit handle truncation low enough handle values could be misinterpreted as stock brushes indices in FillRect(). Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/gdiobj.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/gdiobj.c b/dlls/gdi32/gdiobj.c index e861f24..237544d 100644 --- a/dlls/gdi32/gdiobj.c +++ b/dlls/gdi32/gdiobj.c @@ -38,7 +38,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(gdi); -#define FIRST_GDI_HANDLE 16 +#define FIRST_GDI_HANDLE 32 #define MAX_GDI_HANDLES 16384 struct hdc_list

1 0

Stefan Dösinger : wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data ().
by Alexandre Julliard 08 Apr '16

08 Apr '16

Module: wine Branch: master Commit: b284f1383690ab28f46b0273f371215e78647587 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b284f1383690ab28f46b0273f… Author: Stefan Dösinger <stefandoesinger(a)gmx.at> Date: Thu Apr 7 19:38:02 2016 +0200 wined3d: Pass a texture and sub-resource index to wined3d_texture_ops.texture_sub_resource_upload_data(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/texture.c | 27 +++++++++++++-------------- dlls/wined3d/wined3d_private.h | 2 +- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index b31b0e1..0a89665 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -1077,9 +1077,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].resource; - - texture->texture_ops->texture_sub_resource_upload_data(sub_resource, context, &data[i]); + texture->texture_ops->texture_upload_data(texture, i, context, &data[i]); wined3d_texture_validate_location(texture, i, WINED3D_LOCATION_TEXTURE_RGB); wined3d_texture_invalidate_location(texture, i, ~WINED3D_LOCATION_TEXTURE_RGB); } @@ -1089,21 +1087,23 @@ static HRESULT wined3d_texture_upload_data(struct wined3d_texture *texture, return WINED3D_OK; } -static void texture2d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture2d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_surface *surface = surface_from_resource(sub_resource); static const POINT dst_point = {0, 0}; struct wined3d_const_bo_address addr; + unsigned int texture_level; RECT src_rect; - SetRect(&src_rect, 0, 0, surface->resource.width, surface->resource.height); + texture_level = sub_resource_idx % texture->level_count; + SetRect(&src_rect, 0, 0, wined3d_texture_get_level_width(texture, texture_level), + wined3d_texture_get_level_height(texture, texture_level)); addr.buffer_object = 0; addr.addr = data->data; - wined3d_surface_upload_data(surface, context->gl_info, surface->container->resource.format, - &src_rect, data->row_pitch, &dst_point, FALSE, &addr); + wined3d_surface_upload_data(texture->sub_resources[sub_resource_idx].u.surface, context->gl_info, + texture->resource.format, &src_rect, data->row_pitch, &dst_point, FALSE, &addr); } static BOOL texture2d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1199,7 +1199,7 @@ static void texture2d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture2d_ops = { - texture2d_sub_resource_upload_data, + texture2d_upload_data, texture2d_load_location, texture2d_prepare_location, texture2d_prepare_texture, @@ -1684,21 +1684,20 @@ static HRESULT texture_init(struct wined3d_texture *texture, const struct wined3 return WINED3D_OK; } -static void texture3d_sub_resource_upload_data(struct wined3d_resource *sub_resource, +static void texture3d_upload_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data) { - struct wined3d_volume *volume = volume_from_resource(sub_resource); struct wined3d_const_bo_address addr; unsigned int row_pitch, slice_pitch; - wined3d_texture_get_pitch(volume->container, volume->texture_level, &row_pitch, &slice_pitch); + wined3d_texture_get_pitch(texture, sub_resource_idx, &row_pitch, &slice_pitch); if (row_pitch != data->row_pitch || slice_pitch != data->slice_pitch) FIXME("Ignoring row/slice pitch (%u/%u).\n", data->row_pitch, data->slice_pitch); addr.buffer_object = 0; addr.addr = data->data; - wined3d_volume_upload_data(volume, context, &addr); + wined3d_volume_upload_data(texture->sub_resources[sub_resource_idx].u.volume, context, &addr); } static BOOL texture3d_load_location(struct wined3d_texture *texture, unsigned int sub_resource_idx, @@ -1755,7 +1754,7 @@ static void texture3d_cleanup_sub_resources(struct wined3d_texture *texture) static const struct wined3d_texture_ops texture3d_ops = { - texture3d_sub_resource_upload_data, + texture3d_upload_data, texture3d_load_location, texture3d_prepare_location, texture3d_prepare_texture, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cb6d967..e6cd1ef 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2416,7 +2416,7 @@ struct gl_texture struct wined3d_texture_ops { - void (*texture_sub_resource_upload_data)(struct wined3d_resource *sub_resource, + void (*texture_upload_data)(struct wined3d_texture *texture, unsigned int sub_resource_idx, const struct wined3d_context *context, const struct wined3d_sub_resource_data *data); BOOL (*texture_load_location)(struct wined3d_texture *texture, unsigned int sub_resource_idx, struct wined3d_context *context, DWORD location);

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 11db4d4a1d1b9a63962f3ef1f5dac616dd7d4fed URL: http://source.winehq.org/git/wine.git/?a=commit;h=11db4d4a1d1b9a63962f3ef1f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:38:01 2016 +0200 wined3d: Use the texture dimension helpers in surface_load_texture(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 8ac3b2f..5427ee9 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3044,8 +3044,7 @@ static HRESULT surface_load_drawable(struct wined3d_surface *surface, static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_context *context, BOOL srgb) { - unsigned int width, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; - const RECT src_rect = {0, 0, surface->resource.width, surface->resource.height}; + unsigned int width, height, src_row_pitch, src_slice_pitch, dst_row_pitch, dst_slice_pitch; unsigned int sub_resource_idx = surface_get_sub_resource_idx(surface); const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_texture *texture = surface->container; @@ -3056,6 +3055,7 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, struct wined3d_format format; POINT dst_point = {0, 0}; BYTE *mem = NULL; + RECT src_rect; sub_resource = surface_get_sub_resource(surface); if (wined3d_settings.offscreen_rendering_mode != ORM_FBO @@ -3067,6 +3067,10 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, return WINED3D_OK; } + width = wined3d_texture_get_level_width(texture, surface->texture_level); + height = wined3d_texture_get_level_height(texture, surface->texture_level); + SetRect(&src_rect, 0, 0, width, height); + if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_SRGB | WINED3D_LOCATION_TEXTURE_RGB) && (texture->resource.format_flags & WINED3DFMT_FLAG_FBO_ATTACHABLE_SRGB) && fbo_blit_supported(gl_info, WINED3D_BLIT_OP_COLOR_BLIT, @@ -3092,10 +3096,9 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, DWORD src_location = sub_resource->locations & WINED3D_LOCATION_RB_RESOLVED ? WINED3D_LOCATION_RB_RESOLVED : WINED3D_LOCATION_RB_MULTISAMPLE; DWORD dst_location = srgb ? WINED3D_LOCATION_TEXTURE_SRGB : WINED3D_LOCATION_TEXTURE_RGB; - RECT rect = {0, 0, surface->resource.width, surface->resource.height}; surface_blt_fbo(device, context, WINED3D_TEXF_POINT, surface, src_location, - &rect, surface, dst_location, &rect); + &src_rect, surface, dst_location, &src_rect); return WINED3D_OK; } @@ -3134,8 +3137,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, wined3d_texture_bind_and_dirtify(texture, context, srgb); wined3d_texture_get_pitch(texture, surface->texture_level, &src_row_pitch, &src_slice_pitch); - width = surface->resource.width; - format = *texture->resource.format; if ((conversion = wined3d_format_get_color_key_conversion(texture, TRUE))) format = *wined3d_get_format(gl_info, conversion->dst_format); @@ -3160,8 +3161,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, if (format.convert) { /* This code is entered for texture formats which need a fixup. */ - UINT height = surface->resource.height; - format.byte_count = format.conv_byte_count; wined3d_format_calculate_pitch(&format, 1, width, height, &dst_row_pitch, &dst_slice_pitch); @@ -3180,7 +3179,6 @@ static HRESULT surface_load_texture(struct wined3d_surface *surface, { /* This code is only entered for color keying fixups */ struct wined3d_palette *palette = NULL; - UINT height = surface->resource.height; wined3d_format_calculate_pitch(&format, device->surface_alignment, width, height, &dst_row_pitch, &dst_slice_pitch);

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 7c9ff85452003ad6ea1b45c9b0d405816b3a3b29 URL: http://source.winehq.org/git/wine.git/?a=commit;h=7c9ff85452003ad6ea1b45c9b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:38:00 2016 +0200 wined3d: Use the texture dimension helpers 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 5fd238e..8ac3b2f 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2820,8 +2820,8 @@ static void surface_load_ds_location(struct wined3d_surface *surface, struct win } else { - w = surface->resource.width; - h = surface->resource.height; + w = wined3d_texture_get_level_width(surface->container, surface->texture_level); + h = wined3d_texture_get_level_height(surface->container, surface->texture_level); } if (surface->current_renderbuffer)

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 8c3b0aead55654a4b349ca0fc263907252e32bbb URL: http://source.winehq.org/git/wine.git/?a=commit;h=8c3b0aead55654a4b349ca0fc… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:59 2016 +0200 wined3d: Use the texture dimension helpers in surface_blt_special(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 3e45599..5fd238e 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2662,6 +2662,7 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE if ((src_swapchain || src_surface == rt) && !dst_swapchain) { + unsigned int src_width, src_height; /* Blit from render target to texture */ BOOL stretchx; @@ -2695,8 +2696,10 @@ static HRESULT surface_blt_special(struct wined3d_surface *dst_surface, const RE * back buffer. This is slower than reading line per line, thus not used for flipping * -> If the app wants a scaled image with a dest rect that is bigger than the fb, it has to be copied * pixel by pixel. */ - if (!stretchx || dst_rect->right - dst_rect->left > src_surface->resource.width - || dst_rect->bottom - dst_rect->top > src_surface->resource.height) + src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); + if (!stretchx || dst_rect->right - dst_rect->left > src_width + || dst_rect->bottom - dst_rect->top > src_height) { TRACE("No stretching in x direction, using direct framebuffer -> texture copy.\n"); fb_copy_to_texture_direct(dst_surface, src_surface, src_rect, dst_rect, filter);

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 35fdf09643e5f45b7cc688f2c9ceb9b9ade98b6b URL: http://source.winehq.org/git/wine.git/?a=commit;h=35fdf09643e5f45b7cc688f2c… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:58 2016 +0200 wined3d: Use the texture dimension helpers in surface_translate_drawable_coords(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 301aa16..3e45599 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2447,9 +2447,10 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st * origin, while D3D has a top-left origin. */ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HWND window, RECT *rect) { + struct wined3d_texture *texture = surface->container; UINT drawable_height; - if (surface->container->swapchain && surface->container == surface->container->swapchain->front_buffer) + if (texture->swapchain && texture == texture->swapchain->front_buffer) { POINT offset = {0, 0}; RECT windowsize; @@ -2462,7 +2463,7 @@ void surface_translate_drawable_coords(const struct wined3d_surface *surface, HW } else { - drawable_height = surface->resource.height; + drawable_height = wined3d_texture_get_level_height(texture, surface->texture_level); } rect->top = drawable_height - rect->top;

1 0

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

08 Apr '16

Module: wine Branch: master Commit: 81dae1c6362bcd0d0b2571e535f3a3ed4f9ff616 URL: http://source.winehq.org/git/wine.git/?a=commit;h=81dae1c6362bcd0d0b2571e53… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Apr 7 19:37:57 2016 +0200 wined3d: Use the texture dimension helpers in fb_copy_to_texture_hwstretch(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 9c015cc..301aa16 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -2172,9 +2172,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st struct wined3d_device *device = dst_texture->resource.device; GLuint src, backup = 0; float left, right, top, bottom; /* Texture coordinates */ - UINT fbwidth = src_surface->resource.width; - UINT fbheight = src_surface->resource.height; const struct wined3d_gl_info *gl_info; + unsigned int src_width, src_height; struct wined3d_context *context; GLenum drawBuffer = GL_BACK; GLenum offscreen_buffer; @@ -2192,6 +2191,8 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st wined3d_texture_load(dst_texture, context, FALSE); offscreen_buffer = context_get_offscreen_gl_buffer(context); + src_width = wined3d_texture_get_level_width(src_texture, src_surface->texture_level); + src_height = wined3d_texture_get_level_height(src_texture, src_surface->texture_level); src_offscreen = wined3d_resource_is_offscreen(&src_texture->resource); noBackBufferBackup = src_offscreen && wined3d_settings.offscreen_rendering_mode == ORM_FBO; @@ -2258,7 +2259,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st } /* TODO: Only back up the part that will be overwritten */ - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(texture_target, 0, 0, 0, 0, 0, src_width, src_height); checkGLcall("glCopyTexSubImage2D"); @@ -2288,7 +2289,7 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, src_surface->pow2Width, src_surface->pow2Height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL); checkGLcall("glTexImage2D"); - gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, fbwidth, fbheight); + gl_info->gl_ops.gl.p_glCopyTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, 0, 0, src_width, src_height); gl_info->gl_ops.gl.p_glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); checkGLcall("glTexParameteri"); @@ -2312,13 +2313,13 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st if (!upsidedown) { - top = src_surface->resource.height - src_rect->top; - bottom = src_surface->resource.height - src_rect->bottom; + top = src_height - src_rect->top; + bottom = src_height - src_rect->bottom; } else { - top = src_surface->resource.height - src_rect->bottom; - bottom = src_surface->resource.height - src_rect->top; + top = src_height - src_rect->bottom; + bottom = src_height - src_rect->top; } if (src_texture->flags & WINED3D_TEXTURE_NORMALIZED_COORDS) @@ -2398,20 +2399,20 @@ static void fb_copy_to_texture_hwstretch(struct wined3d_surface *dst_surface, st gl_info->gl_ops.gl.p_glBegin(GL_QUADS); /* top left */ gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(0, fbheight); + gl_info->gl_ops.gl.p_glVertex2i(0, src_height); /* bottom left */ - gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)fbheight / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glTexCoord2f(0.0f, (float)src_height / (float)src_surface->pow2Height); gl_info->gl_ops.gl.p_glVertex2i(0, 0); /* bottom right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, - (float)fbheight / (float)src_surface->pow2Height); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, 0); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, + (float)src_height / (float)src_surface->pow2Height); + gl_info->gl_ops.gl.p_glVertex2i(src_width, 0); /* top right */ - gl_info->gl_ops.gl.p_glTexCoord2f((float)fbwidth / (float)src_surface->pow2Width, 0.0f); - gl_info->gl_ops.gl.p_glVertex2i(fbwidth, fbheight); + gl_info->gl_ops.gl.p_glTexCoord2f((float)src_width / (float)src_surface->pow2Width, 0.0f); + gl_info->gl_ops.gl.p_glVertex2i(src_width, src_height); gl_info->gl_ops.gl.p_glEnd(); } gl_info->gl_ops.gl.p_glDisable(texture_target);

1 0

← Newer
1
...
57
58
59
60
61
62
63
...
75
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits April 2016