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

Dmitry Timoshkov : gdiplus: Create GDI bitmap only when needed.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: b39425f3cfb497c329e2bb3d05645a62221a5424 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b39425f3cfb497c329e2bb3d0… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Sun Mar 11 14:58:08 2012 +0800 gdiplus: Create GDI bitmap only when needed. --- dlls/gdiplus/brush.c | 11 ----------- dlls/gdiplus/gdiplus_private.h | 1 - dlls/gdiplus/graphics.c | 9 +++++---- 3 files changed, 5 insertions(+), 16 deletions(-) diff --git a/dlls/gdiplus/brush.c b/dlls/gdiplus/brush.c index ca4d8eb..0b326ed 100644 --- a/dlls/gdiplus/brush.c +++ b/dlls/gdiplus/brush.c @@ -47,15 +47,9 @@ GpStatus WINGDIPAPI GdipCloneBrush(GpBrush *brush, GpBrush **clone) switch(brush->bt){ case BrushTypeSolidColor: { - GpSolidFill *fill; *clone = GdipAlloc(sizeof(GpSolidFill)); if (!*clone) return OutOfMemory; - - fill = (GpSolidFill*)*clone; - memcpy(*clone, brush, sizeof(GpSolidFill)); - - fill->bmp = ARGB2BMP(fill->color); break; } case BrushTypeHatchFill: @@ -654,7 +648,6 @@ GpStatus WINGDIPAPI GdipCreateSolidFill(ARGB color, GpSolidFill **sf) (*sf)->brush.bt = BrushTypeSolidColor; (*sf)->color = color; - (*sf)->bmp = ARGB2BMP(color); TRACE("<-- %p\n", *sf); @@ -899,10 +892,6 @@ GpStatus WINGDIPAPI GdipDeleteBrush(GpBrush *brush) GdipFree(((GpPathGradient*) brush)->blendfac); GdipFree(((GpPathGradient*) brush)->blendpos); break; - case BrushTypeSolidColor: - if (((GpSolidFill*)brush)->bmp) - DeleteObject(((GpSolidFill*)brush)->bmp); - break; case BrushTypeLinearGradient: GdipFree(((GpLineGradient*)brush)->blendfac); GdipFree(((GpLineGradient*)brush)->blendpos); diff --git a/dlls/gdiplus/gdiplus_private.h b/dlls/gdiplus/gdiplus_private.h index 2a5fe69..2081290 100644 --- a/dlls/gdiplus/gdiplus_private.h +++ b/dlls/gdiplus/gdiplus_private.h @@ -183,7 +183,6 @@ struct GpHatch{ struct GpSolidFill{ GpBrush brush; ARGB color; - HBITMAP bmp; }; struct GpPathGradient{ diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index d300f59..fee6935 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -847,7 +847,9 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) case BrushTypeSolidColor: { GpSolidFill *fill = (GpSolidFill*)brush; - if (fill->bmp) + HBITMAP bmp = ARGB2BMP(fill->color); + + if (bmp) { RECT rc; /* partially transparent fill */ @@ -856,12 +858,11 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) if (GetClipBox(graphics->hdc, &rc) != NULLREGION) { HDC hdc = CreateCompatibleDC(NULL); - HBITMAP oldbmp; BLENDFUNCTION bf; if (!hdc) break; - oldbmp = SelectObject(hdc, fill->bmp); + SelectObject(hdc, bmp); bf.BlendOp = AC_SRC_OVER; bf.BlendFlags = 0; @@ -870,10 +871,10 @@ static void brush_fill_path(GpGraphics *graphics, GpBrush* brush) GdiAlphaBlend(graphics->hdc, rc.left, rc.top, rc.right-rc.left, rc.bottom-rc.top, hdc, 0, 0, 1, 1, bf); - SelectObject(hdc, oldbmp); DeleteDC(hdc); } + DeleteObject(bmp); break; } /* else fall through */

1 0

Henri Verbeet : wined3d: Pass correctly offset pointers to surface_cpu_blt_compressed().
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 29468906bba02d97a7353729fd64ce2fd68e4c6d URL: http://source.winehq.org/git/wine.git/?a=commit;h=29468906bba02d97a7353729f… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:08 2012 +0100 wined3d: Pass correctly offset pointers to surface_cpu_blt_compressed(). This was debugged by Alexey Loukianov. --- dlls/wined3d/surface.c | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index b7273f7..1b23880 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6620,6 +6620,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * const struct wined3d_format *src_format, *dst_format; struct wined3d_surface *orig_src = src_surface; struct wined3d_mapped_rect dst_map, src_map; + const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; const BYTE *sbuf; RECT xdst,xsrc; @@ -6745,6 +6746,17 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dstwidth = xdst.right - xdst.left; width = (xdst.right - xdst.left) * bpp; + if (src_surface) + sbase = (BYTE *)src_map.data + + ((xsrc.top / src_format->block_height) * src_map.row_pitch) + + ((xsrc.left / src_format->block_width) * src_format->block_byte_count); + if (dst_rect && src_surface != dst_surface) + dbuf = dst_map.data; + else + dbuf = (BYTE *)dst_map.data + + ((xdst.top / dst_format->block_height) * dst_map.row_pitch) + + ((xdst.left / dst_format->block_width) * dst_format->block_byte_count); + if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_BLOCKS) { TRACE("%s -> %s copy.\n", debug_d3dformat(src_format->id), debug_d3dformat(dst_format->id)); @@ -6770,17 +6782,12 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * goto release; } - hr = surface_cpu_blt_compressed(src_map.data, dst_map.data, + hr = surface_cpu_blt_compressed(sbase, dbuf, src_map.row_pitch, dst_map.row_pitch, dstwidth, dstheight, src_format, flags, fx); goto release; } - if (dst_rect && src_surface != dst_surface) - dbuf = dst_map.data; - else - dbuf = (BYTE *)dst_map.data + (xdst.top * dst_map.row_pitch) + (xdst.left * bpp); - /* First, all the 'source-less' blits */ if (flags & WINEDDBLT_COLORFILL) { @@ -6820,7 +6827,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * /* Now the 'with source' blits. */ if (src_surface) { - const BYTE *sbase; int sx, xinc, sy, yinc; if (!dstwidth || !dstheight) /* Hmm... stupid program? */ @@ -6833,7 +6839,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * FIXME("Filter %s not supported in software blit.\n", debug_d3dtexturefiltertype(filter)); } - sbase = (BYTE *)src_map.data + (xsrc.top * src_map.row_pitch) + xsrc.left * bpp; xinc = (srcwidth << 16) / dstwidth; yinc = (srcheight << 16) / dstheight;

1 0

Henri Verbeet : wined3d: surface_cpu_blt() should always receive valid source and destination rectangles.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: ab4474c19b308311b6408a2802225a44849bb70c URL: http://source.winehq.org/git/wine.git/?a=commit;h=ab4474c19b308311b6408a280… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:09 2012 +0100 wined3d: surface_cpu_blt() should always receive valid source and destination rectangles. --- dlls/wined3d/surface.c | 106 +++++++----------------------------------------- 1 files changed, 15 insertions(+), 91 deletions(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 1b23880..3148473 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -6623,7 +6623,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * const BYTE *sbase = NULL; HRESULT hr = WINED3D_OK; const BYTE *sbuf; - RECT xdst,xsrc; BYTE *dbuf; int x, y; @@ -6631,79 +6630,6 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dst_surface, wine_dbgstr_rect(dst_rect), src_surface, wine_dbgstr_rect(src_rect), flags, fx, debug_d3dtexturefiltertype(filter)); - xsrc = *src_rect; - - if (!src_surface) - { - RECT full_rect; - - full_rect.left = 0; - full_rect.top = 0; - full_rect.right = dst_surface->resource.width; - full_rect.bottom = dst_surface->resource.height; - IntersectRect(&xdst, &full_rect, dst_rect); - } - else - { - BOOL clip_horiz, clip_vert; - - xdst = *dst_rect; - clip_horiz = xdst.left < 0 || xdst.right > (int)dst_surface->resource.width; - clip_vert = xdst.top < 0 || xdst.bottom > (int)dst_surface->resource.height; - - if (clip_vert || clip_horiz) - { - /* Now check if this is a special case or not... */ - if ((flags & WINEDDBLT_DDFX) - || (clip_horiz && xdst.right - xdst.left != xsrc.right - xsrc.left) - || (clip_vert && xdst.bottom - xdst.top != xsrc.bottom - xsrc.top)) - { - WARN("Out of screen rectangle in special case. Not handled right now.\n"); - return WINED3D_OK; - } - - if (clip_horiz) - { - if (xdst.left < 0) - { - xsrc.left -= xdst.left; - xdst.left = 0; - } - if (xdst.right > dst_surface->resource.width) - { - xsrc.right -= (xdst.right - (int)dst_surface->resource.width); - xdst.right = (int)dst_surface->resource.width; - } - } - - if (clip_vert) - { - if (xdst.top < 0) - { - xsrc.top -= xdst.top; - xdst.top = 0; - } - if (xdst.bottom > dst_surface->resource.height) - { - xsrc.bottom -= (xdst.bottom - (int)dst_surface->resource.height); - xdst.bottom = (int)dst_surface->resource.height; - } - } - - /* And check if after clipping something is still to be done... */ - if ((xdst.right <= 0) || (xdst.bottom <= 0) - || (xdst.left >= (int)dst_surface->resource.width) - || (xdst.top >= (int)dst_surface->resource.height) - || (xsrc.right <= 0) || (xsrc.bottom <= 0) - || (xsrc.left >= (int)src_surface->resource.width) - || (xsrc.top >= (int)src_surface->resource.height)) - { - TRACE("Nothing to be done after clipping.\n"); - return WINED3D_OK; - } - } - } - if (src_surface == dst_surface) { wined3d_surface_map(dst_surface, &dst_map, NULL, 0); @@ -6733,29 +6659,27 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * { src_format = dst_format; } - if (dst_rect) - wined3d_surface_map(dst_surface, &dst_map, &xdst, 0); - else - wined3d_surface_map(dst_surface, &dst_map, NULL, 0); + + wined3d_surface_map(dst_surface, &dst_map, dst_rect, 0); } bpp = dst_surface->resource.format->byte_count; - srcheight = xsrc.bottom - xsrc.top; - srcwidth = xsrc.right - xsrc.left; - dstheight = xdst.bottom - xdst.top; - dstwidth = xdst.right - xdst.left; - width = (xdst.right - xdst.left) * bpp; + srcheight = src_rect->bottom - src_rect->top; + srcwidth = src_rect->right - src_rect->left; + dstheight = dst_rect->bottom - dst_rect->top; + dstwidth = dst_rect->right - dst_rect->left; + width = (dst_rect->right - dst_rect->left) * bpp; if (src_surface) sbase = (BYTE *)src_map.data - + ((xsrc.top / src_format->block_height) * src_map.row_pitch) - + ((xsrc.left / src_format->block_width) * src_format->block_byte_count); - if (dst_rect && src_surface != dst_surface) + + ((src_rect->top / src_format->block_height) * src_map.row_pitch) + + ((src_rect->left / src_format->block_width) * src_format->block_byte_count); + if (src_surface != dst_surface) dbuf = dst_map.data; else dbuf = (BYTE *)dst_map.data - + ((xdst.top / dst_format->block_height) * dst_map.row_pitch) - + ((xdst.left / dst_format->block_width) * dst_format->block_byte_count); + + ((dst_rect->top / dst_format->block_height) * dst_map.row_pitch) + + ((dst_rect->left / dst_format->block_width) * dst_format->block_byte_count); if (src_format->flags & dst_format->flags & WINED3DFMT_FLAG_BLOCKS) { @@ -6854,8 +6778,8 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * sbuf = sbase; /* Check for overlapping surfaces. */ - if (src_surface != dst_surface || xdst.top < xsrc.top - || xdst.right <= xsrc.left || xsrc.right <= xdst.left) + if (src_surface != dst_surface || dst_rect->top < src_rect->top + || dst_rect->right <= src_rect->left || src_rect->right <= dst_rect->left) { /* No overlap, or dst above src, so copy from top downwards. */ for (y = 0; y < dstheight; ++y) @@ -6865,7 +6789,7 @@ static HRESULT surface_cpu_blt(struct wined3d_surface *dst_surface, const RECT * dbuf += dst_map.row_pitch; } } - else if (xdst.top > xsrc.top) + else if (dst_rect->top > src_rect->top) { /* Copy from bottom upwards. */ sbuf += src_map.row_pitch * dstheight;

1 0

Henri Verbeet : wined3d: Also recognise the "classic" Mesa Nouveau driver for GeForce 4 and earlier cards.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 112e2e219f88cf81280359ae74ae809a3d288574 URL: http://source.winehq.org/git/wine.git/?a=commit;h=112e2e219f88cf81280359ae7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:10 2012 +0100 wined3d: Also recognise the "classic" Mesa Nouveau driver for GeForce 4 and earlier cards. --- dlls/wined3d/directx.c | 137 +++++++++++++++++++++++------------------------ 1 files changed, 67 insertions(+), 70 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 95581ab..56c4066 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1452,6 +1452,7 @@ static enum wined3d_gl_vendor wined3d_guess_gl_vendor(const struct wined3d_gl_in static enum wined3d_pci_vendor wined3d_guess_card_vendor(const char *gl_vendor_string, const char *gl_renderer) { if (strstr(gl_vendor_string, "NVIDIA") + || strstr(gl_vendor_string, "Nouveau") || strstr(gl_vendor_string, "nouveau")) return HW_VENDOR_NVIDIA; @@ -2044,79 +2045,75 @@ static enum wined3d_pci_device select_card_nvidia_mesa(const struct wined3d_gl_i const char *gl_renderer) { UINT d3d_level; + unsigned int i; - if (strstr(gl_renderer, "Gallium")) + static const struct { - unsigned int i; - - static const struct - { - const char *renderer; - enum wined3d_pci_device id; - } - cards[] = - { - {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, - {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, - {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, - {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, - {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, - {"NVAC", CARD_NVIDIA_GEFORCE_8200}, - {"NVAA", CARD_NVIDIA_GEFORCE_8200}, - {"NVA8", CARD_NVIDIA_GEFORCE_210}, - {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, - {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, - {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, - {"NV98", CARD_NVIDIA_GEFORCE_9200}, - {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, - {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, - {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, - {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, - {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, - {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ - {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ - {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ - {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, - {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ - {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ - {"NV4B", CARD_NVIDIA_GEFORCE_7600}, - {"NV4A", CARD_NVIDIA_GEFORCE_6200}, - {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ - {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, - {"NV46", CARD_NVIDIA_GEFORCE_7400}, - {"NV45", CARD_NVIDIA_GEFORCE_6800}, - {"NV44", CARD_NVIDIA_GEFORCE_6200}, - {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, - {"NV42", CARD_NVIDIA_GEFORCE_6800}, - {"NV41", CARD_NVIDIA_GEFORCE_6800}, - {"NV40", CARD_NVIDIA_GEFORCE_6800}, - {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ - {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ - {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ - {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, - {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, - {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, - {"NV28", CARD_NVIDIA_GEFORCE4_TI4200}, - {"NV25", CARD_NVIDIA_GEFORCE4_TI4200}, - {"NV20", CARD_NVIDIA_GEFORCE3}, - {"NV1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ - {"NV1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ - {"NV18", CARD_NVIDIA_GEFORCE4_MX}, - {"NV17", CARD_NVIDIA_GEFORCE4_MX}, - {"NV16", CARD_NVIDIA_GEFORCE2}, - {"NV15", CARD_NVIDIA_GEFORCE2}, - {"NV11", CARD_NVIDIA_GEFORCE2_MX}, - {"NV10", CARD_NVIDIA_GEFORCE}, - {"NV05", CARD_NVIDIA_RIVA_TNT2}, - {"NV04", CARD_NVIDIA_RIVA_TNT}, - {"NV03", CARD_NVIDIA_RIVA_128}, - }; + const char *renderer; + enum wined3d_pci_device id; + } + cards[] = + { + {"NVC8", CARD_NVIDIA_GEFORCE_GTX570}, + {"NVC4", CARD_NVIDIA_GEFORCE_GTX460}, + {"NVC3", CARD_NVIDIA_GEFORCE_GT440}, + {"NVC0", CARD_NVIDIA_GEFORCE_GTX480}, + {"NVAF", CARD_NVIDIA_GEFORCE_GT320M}, + {"NVAC", CARD_NVIDIA_GEFORCE_8200}, + {"NVAA", CARD_NVIDIA_GEFORCE_8200}, + {"NVA8", CARD_NVIDIA_GEFORCE_210}, + {"NVA5", CARD_NVIDIA_GEFORCE_GT220}, + {"NVA3", CARD_NVIDIA_GEFORCE_GT240}, + {"NVA0", CARD_NVIDIA_GEFORCE_GTX280}, + {"NV98", CARD_NVIDIA_GEFORCE_9200}, + {"NV96", CARD_NVIDIA_GEFORCE_9400GT}, + {"NV94", CARD_NVIDIA_GEFORCE_9600GT}, + {"NV92", CARD_NVIDIA_GEFORCE_9800GT}, + {"NV86", CARD_NVIDIA_GEFORCE_8500GT}, + {"NV84", CARD_NVIDIA_GEFORCE_8600GT}, + {"NV68", CARD_NVIDIA_GEFORCE_6200}, /* 7050 */ + {"NV67", CARD_NVIDIA_GEFORCE_6200}, /* 7000M */ + {"NV63", CARD_NVIDIA_GEFORCE_6200}, /* 7100 */ + {"NV50", CARD_NVIDIA_GEFORCE_8800GTX}, + {"NV4E", CARD_NVIDIA_GEFORCE_6200}, /* 6100 Go / 6150 Go */ + {"NV4C", CARD_NVIDIA_GEFORCE_6200}, /* 6150SE */ + {"NV4B", CARD_NVIDIA_GEFORCE_7600}, + {"NV4A", CARD_NVIDIA_GEFORCE_6200}, + {"NV49", CARD_NVIDIA_GEFORCE_7800GT}, /* 7900 */ + {"NV47", CARD_NVIDIA_GEFORCE_7800GT}, + {"NV46", CARD_NVIDIA_GEFORCE_7400}, + {"NV45", CARD_NVIDIA_GEFORCE_6800}, + {"NV44", CARD_NVIDIA_GEFORCE_6200}, + {"NV43", CARD_NVIDIA_GEFORCE_6600GT}, + {"NV42", CARD_NVIDIA_GEFORCE_6800}, + {"NV41", CARD_NVIDIA_GEFORCE_6800}, + {"NV40", CARD_NVIDIA_GEFORCE_6800}, + {"NV38", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5950 Ultra */ + {"NV36", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5700/5750 */ + {"NV35", CARD_NVIDIA_GEFORCEFX_5800}, /* FX 5900 */ + {"NV34", CARD_NVIDIA_GEFORCEFX_5200}, + {"NV31", CARD_NVIDIA_GEFORCEFX_5600}, + {"NV30", CARD_NVIDIA_GEFORCEFX_5800}, + {"nv28", CARD_NVIDIA_GEFORCE4_TI4200}, + {"nv25", CARD_NVIDIA_GEFORCE4_TI4200}, + {"nv20", CARD_NVIDIA_GEFORCE3}, + {"nv1F", CARD_NVIDIA_GEFORCE4_MX}, /* GF4 MX IGP */ + {"nv1A", CARD_NVIDIA_GEFORCE2}, /* GF2 IGP */ + {"nv18", CARD_NVIDIA_GEFORCE4_MX}, + {"nv17", CARD_NVIDIA_GEFORCE4_MX}, + {"nv16", CARD_NVIDIA_GEFORCE2}, + {"nv15", CARD_NVIDIA_GEFORCE2}, + {"nv11", CARD_NVIDIA_GEFORCE2_MX}, + {"nv10", CARD_NVIDIA_GEFORCE}, + {"nv05", CARD_NVIDIA_RIVA_TNT2}, + {"nv04", CARD_NVIDIA_RIVA_TNT}, + {"nv03", CARD_NVIDIA_RIVA_128}, + }; - for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) - { - if (strstr(gl_renderer, cards[i].renderer)) - return cards[i].id; - } + for (i = 0; i < sizeof(cards) / sizeof(*cards); ++i) + { + if (strstr(gl_renderer, cards[i].renderer)) + return cards[i].id; } FIXME_(d3d_caps)("Unknown renderer %s.\n", debugstr_a(gl_renderer));

1 0

Henri Verbeet : wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 6396ad9e4517bbae146d774137207e7d91f2b25c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6396ad9e4517bbae146d77413… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:11 2012 +0100 wined3d: GL_MAX_TEXTURE_COORDS_ARB is not available without ARB_fragment_program. --- dlls/wined3d/directx.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 56c4066..5c46d07 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2542,20 +2542,21 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter) glGetIntegerv(GL_MAX_TEXTURE_UNITS_ARB, &gl_max); gl_info->limits.textures = min(MAX_TEXTURES, gl_max); TRACE_(d3d_caps)("Max textures: %d.\n", gl_info->limits.textures); - glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); - gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); - TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); if (gl_info->supported[ARB_FRAGMENT_PROGRAM]) { GLint tmp; + glGetIntegerv(GL_MAX_TEXTURE_COORDS_ARB, &gl_max); + gl_info->limits.texture_coords = min(MAX_TEXTURES, gl_max); glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS_ARB, &tmp); gl_info->limits.fragment_samplers = min(MAX_FRAGMENT_SAMPLERS, tmp); } else { + gl_info->limits.texture_coords = max(gl_info->limits.texture_coords, gl_max); gl_info->limits.fragment_samplers = max(gl_info->limits.fragment_samplers, gl_max); } + TRACE_(d3d_caps)("Max texture coords: %d.\n", gl_info->limits.texture_coords); TRACE_(d3d_caps)("Max fragment samplers: %d.\n", gl_info->limits.fragment_samplers); if (gl_info->supported[ARB_VERTEX_SHADER])

1 0

Henri Verbeet : ddraw: Get rid of IDirectDrawSurfaceImpl.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 5f43cd2631b671e838ef37172a8fd088fda13ad3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5f43cd2631b671e838ef37172… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Sun Mar 11 22:03:12 2012 +0100 ddraw: Get rid of IDirectDrawSurfaceImpl. --- dlls/ddraw/ddraw.c | 91 ++-- dlls/ddraw/ddraw_private.h | 61 ++-- dlls/ddraw/device.c | 72 ++-- dlls/ddraw/main.c | 2 +- dlls/ddraw/surface.c | 1199 ++++++++++++++++++++++++-------------------- 5 files changed, 773 insertions(+), 652 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5f43cd2631b671e838ef3…

1 0

Alexandre Julliard : server: Create some kernel notification events.
by Alexandre Julliard 12 Mar '12

12 Mar '12

Module: wine Branch: master Commit: 9c6466ac341d10dd55f8b804ea1326608359ec1d URL: http://source.winehq.org/git/wine.git/?a=commit;h=9c6466ac341d10dd55f8b804e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Mar 12 10:27:40 2012 +0100 server: Create some kernel notification events. --- server/directory.c | 35 ++++++++++++++++++++++++++++++++--- 1 files changed, 32 insertions(+), 3 deletions(-) diff --git a/server/directory.c b/server/directory.c index 112ad12..6250177 100644 --- a/server/directory.c +++ b/server/directory.c @@ -371,6 +371,7 @@ void init_directories(void) static const WCHAR dir_mailslotW[] = {'\\','D','e','v','i','c','e','\\','M','a','i','l','S','l','o','t'}; static const WCHAR dir_objtypeW[] = {'O','b','j','e','c','t','T','y','p','e','s',}; static const WCHAR dir_sessionsW[] = {'S','e','s','s','i','o','n','s'}; + static const WCHAR dir_kernelW[] = {'K','e','r','n','e','l','O','b','j','e','c','t','s'}; static const struct unicode_str dir_global_str = {dir_globalW, sizeof(dir_globalW)}; static const struct unicode_str dir_driver_str = {dir_driverW, sizeof(dir_driverW)}; static const struct unicode_str dir_device_str = {dir_deviceW, sizeof(dir_deviceW)}; @@ -379,6 +380,7 @@ void init_directories(void) static const struct unicode_str dir_mailslot_str = {dir_mailslotW, sizeof(dir_mailslotW)}; static const struct unicode_str dir_objtype_str = {dir_objtypeW, sizeof(dir_objtypeW)}; static const struct unicode_str dir_sessions_str = {dir_sessionsW, sizeof(dir_sessionsW)}; + static const struct unicode_str dir_kernel_str = {dir_kernelW, sizeof(dir_kernelW)}; /* symlinks */ static const WCHAR link_dosdevW[] = {'D','o','s','D','e','v','i','c','e','s'}; @@ -404,18 +406,36 @@ void init_directories(void) static const struct unicode_str named_pipe_str = {named_pipeW, sizeof(named_pipeW)}; static const struct unicode_str mailslot_str = {mailslotW, sizeof(mailslotW)}; - struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions; + /* events */ + static const WCHAR event_low_memW[] = {'L','o','w','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_low_pagedW[] = {'L','o','w','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_low_nonpgW[] = {'L','o','w','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_memW[] = {'H','i','g','h','M','e','m','o','r','y','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_pagedW[] = {'H','i','g','h','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const WCHAR event_high_nonpgW[] = {'H','i','g','h','N','o','n','P','a','g','e','d','P','o','o','l','C','o','n','d','i','t','i','o','n'}; + static const struct unicode_str kernel_events[] = + { + { event_low_memW, sizeof(event_low_memW) }, + { event_low_pagedW, sizeof(event_low_pagedW) }, + { event_low_nonpgW, sizeof(event_low_nonpgW) }, + { event_high_memW, sizeof(event_high_memW) }, + { event_high_pagedW, sizeof(event_high_pagedW) }, + { event_high_nonpgW, sizeof(event_high_nonpgW) } + }; + + struct directory *dir_driver, *dir_device, *dir_global, *dir_basenamed, *dir_sessions, *dir_kernel; struct symlink *link_dosdev, *link_global1, *link_global2, *link_local, *link_pipe, *link_mailslot, *link_0, *link_session; + unsigned int i; root_directory = create_directory( NULL, NULL, 0, HASH_SIZE ); dir_driver = create_directory( root_directory, &dir_driver_str, 0, HASH_SIZE ); dir_device = create_directory( root_directory, &dir_device_str, 0, HASH_SIZE ); dir_objtype = create_directory( root_directory, &dir_objtype_str, 0, HASH_SIZE ); dir_sessions = create_directory( root_directory, &dir_sessions_str, 0, HASH_SIZE ); + dir_kernel = create_directory( root_directory, &dir_kernel_str, 0, HASH_SIZE ); make_object_static( &root_directory->obj ); make_object_static( &dir_driver->obj ); make_object_static( &dir_objtype->obj ); - make_object_static( &dir_sessions->obj ); dir_global = create_directory( NULL, &dir_global_str, 0, HASH_SIZE ); /* use a larger hash table for this one since it can contain a lot of objects */ @@ -443,10 +463,19 @@ void init_directories(void) make_object_static( (struct object *)link_0 ); make_object_static( (struct object *)link_session ); - /* the symlinks or devices hold references so we can release these */ + /* events */ + for (i = 0; i < sizeof(kernel_events)/sizeof(kernel_events[0]); i++) + { + struct event *event = create_event( dir_kernel, &kernel_events[i], 0, 1, 0, NULL ); + make_object_static( (struct object *)event ); + } + + /* the objects hold references so we can release these directories */ release_object( dir_global ); release_object( dir_device ); release_object( dir_basenamed ); + release_object( dir_sessions ); + release_object( dir_kernel ); } /* create a directory object */

1 0

Matteo Bruni : wined3d: Clamp fog coordinate in the vertex shader.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 2d810bdc892fc028d4180066c46649709058267f URL: http://source.winehq.org/git/wine.git/?a=commit;h=2d810bdc892fc028d4180066c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:15 2012 +0100 wined3d: Clamp fog coordinate in the vertex shader. --- dlls/wined3d/glsl_shader.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 682e740..d66522f 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -3938,11 +3938,10 @@ static GLhandleARB generate_param_reorder_function(struct wined3d_shader_buffer } else if (shader_match_semantic(semantic_name, WINED3D_DECL_USAGE_FOG)) { - shader_addline(buffer, "gl_FogFragCoord = OUT[%u].%c;\n", i, reg_mask[1]); + shader_addline(buffer, "gl_FogFragCoord = clamp(OUT[%u].%c, 0.0, 1.0);\n", i, reg_mask[1]); } } shader_addline(buffer, "}\n"); - } else {

1 0

Matteo Bruni : wined3d: Clamp fog coordinate in the ARB backend too.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 4ed605f081b21ea311adfa3a0027204165dac6de URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ed605f081b21ea311adfa3a0… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:16 2012 +0100 wined3d: Clamp fog coordinate in the ARB backend too. --- dlls/wined3d/arb_program_shader.c | 29 ++++++++++++++++++++++++----- 1 files changed, 24 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index cf9b909..50cd91a 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -344,6 +344,7 @@ static BOOL need_helper_const(const struct arb_vshader_private *shader_data, if (!use_nv_clip(gl_info)) return TRUE; /* Init the clip texcoord */ if (reg_maps->usesnrm) return TRUE; /* 0.0 */ if (reg_maps->usespow) return TRUE; /* EPS, 0.0 and 1.0 */ + if (reg_maps->fog) return TRUE; /* Clamping fog coord, 0.0 and 1.0 */ return FALSE; } @@ -962,7 +963,7 @@ static void shader_arb_get_register_name(const struct wined3d_shader_instruction const struct wined3d_shader_register *reg, char *register_name, BOOL *is_color) { /* oPos, oFog and oPts in D3D */ - static const char * const rastout_reg_names[] = {"TMP_OUT", "result.fogcoord", "result.pointsize"}; + static const char * const rastout_reg_names[] = {"TMP_OUT", "TMP_FOGCOORD", "result.pointsize"}; const struct wined3d_shader *shader = ins->ctx->shader; const struct wined3d_shader_reg_maps *reg_maps = ins->ctx->reg_maps; BOOL pshader = shader_is_pshader_version(reg_maps->shader_version.type); @@ -3139,10 +3140,26 @@ static void vshader_add_footer(struct shader_arb_ctx_priv *priv_ctx, * the shader, it is set to 0.0(fully fogged, since start = 1.0, end = 0.0) */ if (args->super.fog_src == VS_FOG_Z) + { shader_addline(buffer, "MOV result.fogcoord, TMP_OUT.z;\n"); - else if (!reg_maps->fog) - /* posFixup.x is always 1.0, so we can safely use it */ - shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + else + { + if (!reg_maps->fog) + { + /* posFixup.x is always 1.0, so we can safely use it */ + shader_addline(buffer, "ADD result.fogcoord, posFixup.x, -posFixup.x;\n"); + } + else + { + /* Clamp fogcoord */ + const char *zero = arb_get_helper_value(reg_maps->shader_version.type, ARB_ZERO); + const char *one = arb_get_helper_value(reg_maps->shader_version.type, ARB_ONE); + + shader_addline(buffer, "MIN TMP_FOGCOORD.x, TMP_FOGCOORD.x, %s;\n", one); + shader_addline(buffer, "MAX result.fogcoord.x, TMP_FOGCOORD.x, %s;\n", zero); + } + } /* Clipplanes are always stored without y inversion */ if (use_nv_clip(gl_info) && priv_ctx->target_version >= NV2) @@ -3962,7 +3979,7 @@ static void init_output_registers(const struct wined3d_shader *shader, DWORD sig } priv_ctx->color_output[0] = "result.color.primary"; priv_ctx->color_output[1] = "result.color.secondary"; - priv_ctx->fog_output = "result.fogcoord"; + priv_ctx->fog_output = "TMP_FOGCOORD"; /* Map declared regs to builtins. Use "TA" to /dev/null unread output */ for (i = 0; i < (sizeof(shader->output_signature) / sizeof(*shader->output_signature)); ++i) @@ -4148,6 +4165,8 @@ static GLuint shader_arb_generate_vshader(const struct wined3d_shader *shader, } shader_addline(buffer, "TEMP TMP_OUT;\n"); + if (reg_maps->fog) + shader_addline(buffer, "TEMP TMP_FOGCOORD;\n"); if (need_helper_const(shader_data, reg_maps, gl_info)) { shader_addline(buffer, "PARAM helper_const = { 0.0, 1.0, 2.0, %1.10f};\n", eps);

1 0

Matteo Bruni : d3d9/tests: Reenable a VS fog test.
by Alexandre Julliard 09 Mar '12

09 Mar '12

Module: wine Branch: master Commit: 393b2f137cc086e234857635bccc7d70e0051435 URL: http://source.winehq.org/git/wine.git/?a=commit;h=393b2f137cc086e234857635b… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Thu Mar 8 18:22:17 2012 +0100 d3d9/tests: Reenable a VS fog test. --- dlls/d3d9/tests/visual.c | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 72e4d21..a0695a7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -1847,7 +1847,7 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {0x00fd0200, 0x00f50200, 0x00f50a00, 0x00e91600, 0x00d92600, 0x00c73800, 0x00b24d00, 0x009c6300, 0x00867900, 0x00728d00, 0x005ea100}}, -#if 0 /* FIXME: these fail on GeForce 8500 */ + /* These tests fail on older Nvidia drivers */ /* foggy vertex shader */ {2, 0, D3DFOG_NONE, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, @@ -1861,7 +1861,6 @@ static void fog_with_shader_test(IDirect3DDevice9 *device) {2, 0, D3DFOG_LINEAR, D3DFOG_NONE, {0x00ff0000, 0x00fe0100, 0x00de2100, 0x00bf4000, 0x009f6000, 0x007f8000, 0x005fa000, 0x003fc000, 0x001fe000, 0x0000ff00, 0x0000ff00}}, -#endif /* foggy vertex shader and pixel shader. First 4 tests with vertex fog, * all using the fixed fog-coord linear fog

1 0