February 2013 - Wine-Commits

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawRectangle using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 1223569d644fdfb4e9b920ceeb18079dc6d819c8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1223569d644fdfb4e9b920cee… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:33 2013 +0800 gdiplus: Reimplement GdipDrawRectangle using GdipDrawPath. --- dlls/gdiplus/graphics.c | 34 +++++++++------------------------- 1 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 201ef7b..39c2b0f 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -3398,9 +3398,8 @@ GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[4]; - POINT pti[4]; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -3410,30 +3409,15 @@ GpStatus WINGDIPAPI GdipDrawRectangle(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y; - ptf[2].X = x + width; - ptf[2].Y = y + height; - ptf[3].X = x; - ptf[3].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 4); - Polygon(graphics->hdc, pti, 4); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathRectangle(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawRectangleI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawPie using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 981223a7363738b2b90030e8e61d52aed186df85 URL: http://source.winehq.org/git/wine.git/?a=commit;h=981223a7363738b2b90030e8e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:28 2013 +0800 gdiplus: Reimplement GdipDrawPie using GdipDrawPath. --- dlls/gdiplus/graphics.c | 55 +++++++--------------------------------------- 1 files changed, 9 insertions(+), 46 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7cf9e0e..201ef7b 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -51,18 +51,6 @@ static GpStatus draw_driver_string(GpGraphics *graphics, GDIPCONST UINT16 *text, GDIPCONST GpBrush *brush, GDIPCONST PointF *positions, INT flags, GDIPCONST GpMatrix *matrix); -/* Converts angle (in degrees) to x/y coordinates */ -static void deg2xy(REAL angle, REAL x_0, REAL y_0, REAL *x, REAL *y) -{ - REAL radAngle, hypotenuse; - - radAngle = deg2rad(angle); - hypotenuse = 50.0; /* arbitrary */ - - *x = x_0 + cos(radAngle) * hypotenuse; - *y = y_0 + sin(radAngle) * hypotenuse; -} - /* Converts from gdiplus path point type to gdi path point type. */ static BYTE convert_path_point_type(BYTE type) { @@ -1456,27 +1444,6 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, } } -/* GdipDrawPie/GdipFillPie helper function */ -static void draw_pie(GpGraphics *graphics, REAL x, REAL y, REAL width, - REAL height, REAL startAngle, REAL sweepAngle) -{ - GpPointF ptf[4]; - POINT pti[4]; - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - deg2xy(startAngle+sweepAngle, x + width / 2.0, y + width / 2.0, &ptf[2].X, &ptf[2].Y); - deg2xy(startAngle, x + width / 2.0, y + width / 2.0, &ptf[3].X, &ptf[3].Y); - - transform_and_round_points(graphics, pti, ptf, 4); - - Pie(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y, pti[2].x, - pti[2].y, pti[3].x, pti[3].y); -} - /* Draws the linecap the specified color and size on the hdc. The linecap is in * direction of the line from x1, y1 to x2, y2 and is anchored on x2, y2. Probably * should not be called on an hdc that has a path you care about. */ @@ -3396,7 +3363,8 @@ GpStatus WINGDIPAPI GdipDrawPath(GpGraphics *graphics, GpPen *pen, GpPath *path) GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height, REAL startAngle, REAL sweepAngle) { - INT save_state; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height, startAngle, sweepAngle); @@ -3407,20 +3375,15 @@ GpStatus WINGDIPAPI GdipDrawPie(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - draw_pie(graphics, x, y, width, height, startAngle, sweepAngle); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathPie(path, x, y, width, height, startAngle, sweepAngle); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawPieI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawEllipse using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 6df50f1d164cce46b4d79fa78d54ffbe6bcaac2b URL: http://source.winehq.org/git/wine.git/?a=commit;h=6df50f1d164cce46b4d79fa78… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:23 2013 +0800 gdiplus: Reimplement GdipDrawEllipse using GdipDrawPath. --- dlls/gdiplus/graphics.c | 31 +++++++++---------------------- 1 files changed, 9 insertions(+), 22 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 997dd28..7cf9e0e 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2759,9 +2759,8 @@ GpStatus WINGDIPAPI GdipDrawCurve3I(GpGraphics *graphics, GpPen *pen, GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, REAL y, REAL width, REAL height) { - INT save_state; - GpPointF ptf[2]; - POINT pti[2]; + GpPath *path; + GpStatus status; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x, y, width, height); @@ -2771,27 +2770,15 @@ GpStatus WINGDIPAPI GdipDrawEllipse(GpGraphics *graphics, GpPen *pen, REAL x, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - ptf[0].X = x; - ptf[0].Y = y; - ptf[1].X = x + width; - ptf[1].Y = y + height; - - save_state = prepare_dc(graphics, pen); - SelectObject(graphics->hdc, GetStockObject(NULL_BRUSH)); - - transform_and_round_points(graphics, pti, ptf, 2); - - Ellipse(graphics->hdc, pti[0].x, pti[0].y, pti[1].x, pti[1].y); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathEllipse(path, x, y, width, height); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return Ok; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawEllipseI(GpGraphics *graphics, GpPen *pen, INT x,

1 0

Dmitry Timoshkov : gdiplus: Forward GdipDrawBezier to GdipDrawBeziers.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: ad49f83c7dbcd60abd60c80409495e2ddb4cfde7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad49f83c7dbcd60abd60c8040… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:18 2013 +0800 gdiplus: Forward GdipDrawBezier to GdipDrawBeziers. --- dlls/gdiplus/graphics.c | 77 +---------------------------------------------- 1 files changed, 1 insertions(+), 76 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 3253221..997dd28 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1756,66 +1756,6 @@ static void shorten_bezier_amt(GpPointF * pt, REAL amt, BOOL rev) } } -/* Draws bezier curves between given points, and if caps is true then draws an - * endcap at the end of the last line. */ -static GpStatus draw_polybezier(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti; - GpPointF *ptcopy; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_bezier_amt(&ptcopy[count-4], pen->width, FALSE); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_bezier_amt(&ptcopy[count-4], pen->width * pen->customend->inset, - FALSE); - - if(pen->startcap == LineCapArrowAnchor) - shorten_bezier_amt(ptcopy, pen->width, TRUE); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_bezier_amt(ptcopy, pen->width * pen->customstart->inset, TRUE); - - /* the direction of the line cap is parallel to the direction at the - * end of the bezier (which, if it has been shortened, is not the same - * as the direction from pt[count-2] to pt[count-1]) */ - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 1].X - (ptcopy[count - 1].X - ptcopy[count - 2].X), - pt[count - 1].Y - (ptcopy[count - 1].Y - ptcopy[count - 2].Y), - pt[count - 1].X, pt[count - 1].Y); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[0].X - (ptcopy[0].X - ptcopy[1].X), - pt[0].Y - (ptcopy[0].Y - ptcopy[1].Y), pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - PolyBezier(graphics->hdc, pti, count); - - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Draws a combination of bezier curves and lines between points. */ static GpStatus draw_poly(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF * pt, GDIPCONST BYTE * types, INT count, BOOL caps) @@ -2538,9 +2478,7 @@ GpStatus WINGDIPAPI GdipDrawArcI(GpGraphics *graphics, GpPen *pen, INT x, GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, REAL y1, REAL x2, REAL y2, REAL x3, REAL y3, REAL x4, REAL y4) { - INT save_state; GpPointF pt[4]; - GpStatus retval; TRACE("(%p, %p, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f, %.2f)\n", graphics, pen, x1, y1, x2, y2, x3, y3, x4, y4); @@ -2551,12 +2489,6 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - pt[0].X = x1; pt[0].Y = y1; pt[1].X = x2; @@ -2565,14 +2497,7 @@ GpStatus WINGDIPAPI GdipDrawBezier(GpGraphics *graphics, GpPen *pen, REAL x1, pt[2].Y = y3; pt[3].X = x4; pt[3].Y = y4; - - save_state = prepare_dc(graphics, pen); - - retval = draw_polybezier(graphics, pen, pt, 4, TRUE); - - restore_dc(graphics, save_state); - - return retval; + return GdipDrawBeziers(graphics, pen, pt, 4); } GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawBeziers using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: ae8826c43ef782b34cabc8ac38080f21387b4d9b URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae8826c43ef782b34cabc8ac3… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:12 2013 +0800 gdiplus: Reimplement GdipDrawBeziers using GdipDrawPath. --- dlls/gdiplus/graphics.c | 22 ++++++++++------------ 1 files changed, 10 insertions(+), 12 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index b408db4..3253221 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -2587,8 +2587,8 @@ GpStatus WINGDIPAPI GdipDrawBezierI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT i; - GpStatus ret; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -2598,17 +2598,15 @@ GpStatus WINGDIPAPI GdipDrawBeziers(GpGraphics *graphics, GpPen *pen, if(graphics->busy) return ObjectBusy; - for(i = 0; i < floor(count / 4); i++){ - ret = GdipDrawBezier(graphics, pen, - points[4*i].X, points[4*i].Y, - points[4*i + 1].X, points[4*i + 1].Y, - points[4*i + 2].X, points[4*i + 2].Y, - points[4*i + 3].X, points[4*i + 3].Y); - if(ret != Ok) - return ret; - } + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - return Ok; + status = GdipAddPathBeziers(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); + + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawBeziersI(GpGraphics *graphics, GpPen *pen,

1 0

Dmitry Timoshkov : gdiplus: Reimplement GdipDrawLines using GdipDrawPath.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 2fd1bf60aef8ab14ab128963eb5c009cac9f58e5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2fd1bf60aef8ab14ab128963e… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Feb 19 11:45:02 2013 +0800 gdiplus: Reimplement GdipDrawLines using GdipDrawPath. --- dlls/gdiplus/graphics.c | 79 +++++----------------------------------------- 1 files changed, 9 insertions(+), 70 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 7f221bb..738a54c 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -1713,63 +1713,6 @@ static void shorten_line_amt(REAL x1, REAL y1, REAL *x2, REAL *y2, REAL amt) shorten_line_percent(x1, y1, x2, y2, percent); } -/* Draws lines between the given points, and if caps is true then draws an endcap - * at the end of the last line. */ -static GpStatus draw_polyline(GpGraphics *graphics, GpPen *pen, - GDIPCONST GpPointF * pt, INT count, BOOL caps) -{ - POINT *pti = NULL; - GpPointF *ptcopy = NULL; - GpStatus status = GenericError; - - if(!count) - return Ok; - - pti = GdipAlloc(count * sizeof(POINT)); - ptcopy = GdipAlloc(count * sizeof(GpPointF)); - - if(!pti || !ptcopy){ - status = OutOfMemory; - goto end; - } - - memcpy(ptcopy, pt, count * sizeof(GpPointF)); - - if(caps){ - if(pen->endcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, pen->width); - else if((pen->endcap == LineCapCustom) && pen->customend) - shorten_line_amt(ptcopy[count-2].X, ptcopy[count-2].Y, - &ptcopy[count-1].X, &ptcopy[count-1].Y, - pen->customend->inset * pen->width); - - if(pen->startcap == LineCapArrowAnchor) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, pen->width); - else if((pen->startcap == LineCapCustom) && pen->customstart) - shorten_line_amt(ptcopy[1].X, ptcopy[1].Y, - &ptcopy[0].X, &ptcopy[0].Y, - pen->customstart->inset * pen->width); - - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->endcap, pen->width, pen->customend, - pt[count - 2].X, pt[count - 2].Y, pt[count - 1].X, pt[count - 1].Y); - draw_cap(graphics, get_gdi_brush_color(pen->brush), pen->startcap, pen->width, pen->customstart, - pt[1].X, pt[1].Y, pt[0].X, pt[0].Y); - } - - transform_and_round_points(graphics, pti, ptcopy, count); - - if(Polyline(graphics->hdc, pti, count)) - status = Ok; - -end: - GdipFree(pti); - GdipFree(ptcopy); - - return status; -} - /* Conducts a linear search to find the bezier points that will back off * the endpoint of the curve by a distance of amt. Linear search works * better than binary in this case because there are multiple solutions, @@ -3473,8 +3416,8 @@ GpStatus WINGDIPAPI GdipDrawLineI(GpGraphics *graphics, GpPen *pen, INT x1, GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST GpPointF *points, INT count) { - INT save_state; - GpStatus retval; + GpStatus status; + GpPath *path; TRACE("(%p, %p, %p, %d)\n", graphics, pen, points, count); @@ -3484,19 +3427,15 @@ GpStatus WINGDIPAPI GdipDrawLines(GpGraphics *graphics, GpPen *pen, GDIPCONST if(graphics->busy) return ObjectBusy; - if (!graphics->hdc) - { - FIXME("graphics object has no HDC\n"); - return Ok; - } - - save_state = prepare_dc(graphics, pen); - - retval = draw_polyline(graphics, pen, points, count, TRUE); + status = GdipCreatePath(FillModeAlternate, &path); + if (status != Ok) return status; - restore_dc(graphics, save_state); + status = GdipAddPathLine2(path, points, count); + if (status == Ok) + status = GdipDrawPath(graphics, pen, path); - return retval; + GdipDeletePath(path); + return status; } GpStatus WINGDIPAPI GdipDrawLinesI(GpGraphics *graphics, GpPen *pen, GDIPCONST

1 0

Matteo Bruni : wined3d: Add RESZ support.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 5e28b0c9747369b752102e56b94e58a012b8cf6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5e28b0c9747369b752102e56b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:23 2013 +0100 wined3d: Add RESZ support. --- dlls/wined3d/device.c | 22 ++++++++++++++++++++++ dlls/wined3d/utils.c | 11 +++++++++++ include/wine/wined3d.h | 3 +++ 3 files changed, 36 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bbd27df..c7874ba 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2212,6 +2212,22 @@ void CDECL wined3d_device_get_viewport(const struct wined3d_device *device, stru *viewport = device->stateBlock->state.viewport; } +static void resolve_depth_buffer(struct wined3d_state *state) +{ + struct wined3d_texture *texture = state->textures[0]; + struct wined3d_surface *depth_stencil, *surface; + + if (!texture || texture->resource.type != WINED3D_RTYPE_TEXTURE + || !(texture->resource.format->flags & WINED3DFMT_FLAG_DEPTH)) + return; + surface = surface_from_resource(texture->sub_resources[0]); + depth_stencil = state->fb->depth_stencil; + if (!depth_stencil) + return; + + wined3d_surface_blt(surface, NULL, depth_stencil, NULL, 0, NULL, WINED3D_TEXF_POINT); +} + void CDECL wined3d_device_set_render_state(struct wined3d_device *device, enum wined3d_render_state state, DWORD value) { @@ -2234,6 +2250,12 @@ void CDECL wined3d_device_set_render_state(struct wined3d_device *device, TRACE("Application is setting the old value over, nothing to do.\n"); else device_invalidate_state(device, STATE_RENDER(state)); + + if (state == WINED3D_RS_POINTSIZE && value == WINED3D_RESZ_CODE) + { + TRACE("RESZ multisampled depth buffer resolve triggered.\n"); + resolve_depth_buffer(&device->stateBlock->state); + } } DWORD CDECL wined3d_device_get_render_state(const struct wined3d_device *device, enum wined3d_render_state state) diff --git a/dlls/wined3d/utils.c b/dlls/wined3d/utils.c index 4b29ec8..7c508ee 100644 --- a/dlls/wined3d/utils.c +++ b/dlls/wined3d/utils.c @@ -126,6 +126,7 @@ static const struct wined3d_format_channels formats[] = {WINED3DFMT_NVDB, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INST, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_INTZ, 0, 0, 0, 0, 0, 0, 0, 0, 4, 24, 8}, + {WINED3DFMT_RESZ, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, {WINED3DFMT_NVHU, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NVHS, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0}, {WINED3DFMT_NULL, 8, 8, 8, 8, 0, 8, 16, 24, 4, 0, 0}, @@ -1712,6 +1713,15 @@ static void apply_format_fixups(struct wined3d_adapter *adapter, struct wined3d_ gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE; } + /* RESZ aka AMD DX9-level hack for multisampled depth buffer resolve. You query for RESZ + * support by checking for availability of MAKEFOURCC('R','E','S','Z') surfaces with + * RENDERTARGET usage. */ + if (gl_info->supported[ARB_FRAMEBUFFER_OBJECT]) + { + idx = getFmtIdx(WINED3DFMT_RESZ); + gl_info->formats[idx].flags |= WINED3DFMT_FLAG_TEXTURE | WINED3DFMT_FLAG_RENDERTARGET; + } + for (i = 0; i < sizeof(formats) / sizeof(*formats); ++i) { struct wined3d_format *format = &gl_info->formats[idx]; @@ -1975,6 +1985,7 @@ const char *debug_d3dformat(enum wined3d_format_id format_id) FMT_TO_STR(WINED3DFMT_B8G8R8A8_UNORM); FMT_TO_STR(WINED3DFMT_B8G8R8X8_UNORM); FMT_TO_STR(WINED3DFMT_INTZ); + FMT_TO_STR(WINED3DFMT_RESZ); FMT_TO_STR(WINED3DFMT_NULL); FMT_TO_STR(WINED3DFMT_R16); FMT_TO_STR(WINED3DFMT_AL16); diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 723d938..378a46b 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -245,6 +245,7 @@ enum wined3d_format_id WINED3DFMT_NVHU = WINEMAKEFOURCC('N','V','H','U'), WINED3DFMT_NVHS = WINEMAKEFOURCC('N','V','H','S'), WINED3DFMT_INTZ = WINEMAKEFOURCC('I','N','T','Z'), + WINED3DFMT_RESZ = WINEMAKEFOURCC('R','E','S','Z'), WINED3DFMT_NULL = WINEMAKEFOURCC('N','U','L','L'), WINED3DFMT_R16 = WINEMAKEFOURCC(' ','R','1','6'), WINED3DFMT_AL16 = WINEMAKEFOURCC('A','L','1','6'), @@ -1216,6 +1217,8 @@ enum wined3d_display_rotation #define WINED3D_LEGACY_DEPTH_BIAS 0x00000001 #define WINED3D_NO3D 0x00000002 +#define WINED3D_RESZ_CODE 0x7fa05000 + /* dwDDFX */ /* arithmetic stretching along y axis */ #define WINEDDBLTFX_ARITHSTRETCHY 0x00000001

1 0

Ken Thomases : winemac: Don't bring a window onto the screen in SetFocus().
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 6cfa0a31d8f6436049e0af22918a8e4984bbc954 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6cfa0a31d8f6436049e0af229… Author: Ken Thomases <ken(a)codeweavers.com> Date: Mon Feb 18 21:50:24 2013 -0600 winemac: Don't bring a window onto the screen in SetFocus(). --- dlls/winemac.drv/window.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/winemac.drv/window.c b/dlls/winemac.drv/window.c index 3429e7d..3f344df 100644 --- a/dlls/winemac.drv/window.c +++ b/dlls/winemac.drv/window.c @@ -852,11 +852,10 @@ void CDECL macdrv_SetFocus(HWND hwnd) if (!(hwnd = GetAncestor(hwnd, GA_ROOT))) return; if (!(data = get_win_data(hwnd))) return; - if (data->cocoa_window) + if (data->cocoa_window && data->on_screen) { /* Set Mac focus */ macdrv_give_cocoa_window_focus(data->cocoa_window); - data->on_screen = TRUE; } release_win_data(data);

1 0

Matteo Bruni : wined3d: Make (wined3d_) surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE.
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 25d0d0876d290e1e803ce16ed9d96189ba5948e1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=25d0d0876d290e1e803ce16ed… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon Feb 18 13:56:22 2013 +0100 wined3d: Make (wined3d_)surface_depth_blt_fbo handle locations other than SFLAG_INTEXTURE. --- dlls/d3d9/tests/visual.c | 11 +++-------- dlls/wined3d/surface.c | 42 ++++++++++++++++++++++++++---------------- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 4d429c4..81926ab 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -13411,14 +13411,9 @@ static void multisampled_depth_buffer_test(IDirect3D9 *d3d9) for (i = 0; i < sizeof(expected_colors) / sizeof(*expected_colors); ++i) { D3DCOLOR color = getPixelColorFromSurface(readback, expected_colors[i].x, expected_colors[i].y); - if (i % 4 < 2) - todo_wine ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); - else - ok(color_match(color, expected_colors[i].color, 1), - "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", - expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); + ok(color_match(color, expected_colors[i].color, 1), + "Expected color 0x%08x at (%u, %u), got 0x%08x.\n", + expected_colors[i].color, expected_colors[i].x, expected_colors[i].y, color); } hr = IDirect3DDevice9_Present(device, NULL, NULL, NULL, NULL); diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 57527e4..51a7578 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -1040,17 +1040,20 @@ static BOOL surface_is_full_rect(const struct wined3d_surface *surface, const RE return TRUE; } -static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, struct wined3d_surface *src_surface, - const RECT *src_rect, struct wined3d_surface *dst_surface, const RECT *dst_rect) +static void surface_depth_blt_fbo(const struct wined3d_device *device, + struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { const struct wined3d_gl_info *gl_info; struct wined3d_context *context; DWORD src_mask, dst_mask; GLbitfield gl_mask; - TRACE("device %p, src_surface %p, src_rect %s, dst_surface %p, dst_rect %s.\n", - device, src_surface, wine_dbgstr_rect(src_rect), - dst_surface, wine_dbgstr_rect(dst_rect)); + TRACE("device %p\n", device); + TRACE("src_surface %p, src_location %s, src_rect %s,\n", + src_surface, debug_surflocation(src_location), wine_dbgstr_rect(src_rect)); + TRACE("dst_surface %p, dst_location %s, dst_rect %s.\n", + dst_surface, debug_surflocation(dst_location), wine_dbgstr_rect(dst_rect)); src_mask = src_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); dst_mask = dst_surface->resource.format->flags & (WINED3DFMT_FLAG_DEPTH | WINED3DFMT_FLAG_STENCIL); @@ -1078,9 +1081,9 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s /* Make sure the locations are up-to-date. Loading the destination * surface isn't required if the entire surface is overwritten. */ - surface_load_location(src_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(src_surface, src_location, NULL); if (!surface_is_full_rect(dst_surface, dst_rect)) - surface_load_location(dst_surface, SFLAG_INTEXTURE, NULL); + surface_load_location(dst_surface, dst_location, NULL); context = context_acquire(device, NULL); if (!context->valid) @@ -1092,12 +1095,12 @@ static void wined3d_surface_depth_blt_fbo(const struct wined3d_device *device, s gl_info = context->gl_info; - context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_READ_FRAMEBUFFER, NULL, src_surface, src_location); gl_info->gl_ops.gl.p_glReadBuffer(GL_NONE); checkGLcall("glReadBuffer()"); context_check_fbo_status(context, GL_READ_FRAMEBUFFER); - context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, SFLAG_INTEXTURE); + context_apply_fbo_state_blit(context, GL_DRAW_FRAMEBUFFER, NULL, dst_surface, dst_location); context_set_draw_buffer(context, GL_NONE); context_check_fbo_status(context, GL_DRAW_FRAMEBUFFER); context_invalidate_state(context, STATE_FRAMEBUFFER); @@ -1404,8 +1407,8 @@ static HRESULT wined3d_surface_depth_fill(struct wined3d_surface *surface, const return blitter->depth_fill(device, surface, rect, depth); } -static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, const RECT *src_rect, - struct wined3d_surface *dst_surface, const RECT *dst_rect) +static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, DWORD src_location, const RECT *src_rect, + struct wined3d_surface *dst_surface, DWORD dst_location, const RECT *dst_rect) { struct wined3d_device *device = src_surface->resource.device; @@ -1414,9 +1417,9 @@ static HRESULT wined3d_surface_depth_blt(struct wined3d_surface *src_surface, co dst_rect, dst_surface->resource.usage, dst_surface->resource.pool, dst_surface->resource.format)) return WINED3DERR_INVALIDCALL; - wined3d_surface_depth_blt_fbo(device, src_surface, src_rect, dst_surface, dst_rect); + surface_depth_blt_fbo(device, src_surface, src_location, src_rect, dst_surface, dst_location, dst_rect); - surface_modify_ds_location(dst_surface, SFLAG_INTEXTURE, + surface_modify_ds_location(dst_surface, dst_location, dst_surface->ds_current_size.cx, dst_surface->ds_current_size.cy); return WINED3D_OK; @@ -1612,7 +1615,8 @@ HRESULT CDECL wined3d_surface_blt(struct wined3d_surface *dst_surface, const REC return WINED3DERR_INVALIDCALL; } - if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, &src_rect, dst_surface, &dst_rect))) + if (SUCCEEDED(wined3d_surface_depth_blt(src_surface, src_surface->draw_binding, &src_rect, + dst_surface, dst_surface->draw_binding, &dst_rect))) return WINED3D_OK; } } @@ -6168,16 +6172,22 @@ HRESULT surface_load_location(struct wined3d_surface *surface, DWORD location, c if (surface->resource.usage & WINED3DUSAGE_DEPTHSTENCIL) { - if (location == SFLAG_INTEXTURE) + if (location == SFLAG_INTEXTURE && surface->flags & SFLAG_INDRAWABLE) { struct wined3d_context *context = context_acquire(device, NULL); surface_load_ds_location(surface, context, location); context_release(context); return WINED3D_OK; } + else if (location & surface->flags && surface->draw_binding != SFLAG_INDRAWABLE) + { + /* Already up to date, nothing to do. */ + return WINED3D_OK; + } else { - FIXME("Unimplemented location %s for depth/stencil buffers.\n", debug_surflocation(location)); + FIXME("Unimplemented copy from %s to %s for depth/stencil buffers.\n", + debug_surflocation(surface->flags & SFLAG_LOCATIONS), debug_surflocation(location)); return WINED3DERR_INVALIDCALL; } }

1 0

Michael Stefaniuc : Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.".
by Alexandre Julliard Feb. 19, 2013

Feb. 19, 2013

Module: wine Branch: master Commit: 621d9e444a14885830a1a87178f3d3cce47ab562 URL: http://source.winehq.org/git/wine.git/?a=commit;h=621d9e444a14885830a1a8717… Author: Michael Stefaniuc <mstefani(a)redhat.de> Date: Mon Feb 18 22:55:08 2013 +0100 Revert "dsound/tests: Primary and secondary buffers use the same IDirectSoundBuffer vtbl.". This reverts commit 7959778d3f84680fcee2e0d43cfcd0e613d68242. This is not always the case on Windows. --- dlls/dsound/tests/dsound.c | 3 --- dlls/dsound/tests/dsound8.c | 3 --- 2 files changed, 0 insertions(+), 6 deletions(-) diff --git a/dlls/dsound/tests/dsound.c b/dlls/dsound/tests/dsound.c index 0f199a4..ed17f2a 100644 --- a/dlls/dsound/tests/dsound.c +++ b/dlls/dsound/tests/dsound.c @@ -642,9 +642,6 @@ static HRESULT test_primary_secondary(LPGUID lpGuid) "IDirectSound_CreateSoundBuffer() failed to create a secondary buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0,FALSE,0); diff --git a/dlls/dsound/tests/dsound8.c b/dlls/dsound/tests/dsound8.c index a0b78e5..664ba0c 100644 --- a/dlls/dsound/tests/dsound8.c +++ b/dlls/dsound/tests/dsound8.c @@ -648,9 +648,6 @@ static HRESULT test_primary_secondary8(LPGUID lpGuid) "buffer %08x\n",rc); if (rc==DS_OK && secondary!=NULL) { - todo_wine ok(primary->lpVtbl==secondary->lpVtbl, - "Primary and secondary buffers have different vtbls.\n"); - test_buffer8(dso,&secondary,0,FALSE,0,FALSE,0, winetest_interactive,1.0,0,NULL,0,0);

1 0