- Wine-Commits - list.winehq.org

Mohamad Al-Jaf : include: Add windows.ui.composition.interop.idl file.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: a7569e3ee9c2cf2a1190d1f7d184761210b791ce URL: https://gitlab.winehq.org/wine/wine/-/commit/a7569e3ee9c2cf2a1190d1f7d18476… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Apr 8 20:21:20 2023 -0400 include: Add windows.ui.composition.interop.idl file. Needed for mingw Firefox build. --- include/Makefile.in | 1 + include/windows.ui.composition.interop.idl | 40 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+) diff --git a/include/Makefile.in b/include/Makefile.in index f52314e745d..54d6dca234d 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -838,6 +838,7 @@ SOURCES = \ windows.system.threading.idl \ windows.system.userprofile.idl \ windows.ui.composition.idl \ + windows.ui.composition.interop.idl \ windows.ui.core.idl \ windows.ui.idl \ windows.ui.viewmanagement.idl \ diff --git a/include/windows.ui.composition.interop.idl b/include/windows.ui.composition.interop.idl new file mode 100644 index 00000000000..cde3e62f533 --- /dev/null +++ b/include/windows.ui.composition.interop.idl @@ -0,0 +1,40 @@ +/* + * Copyright (C) 2023 Mohamad Al-Jaf + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#ifdef __WIDL__ +#pragma winrt ns_prefix +#endif + +import "windows.ui.composition.idl"; +import "sdkddkver.h"; + +namespace Windows.UI.Composition { + interface ICompositorInterop; + + [ + object, + uuid(25297d5c-3ad4-4c9c-b5cf-e36a38512330), + pointer_default(unique) + ] + interface ICompositorInterop : IInspectable + { + HRESULT CreateCompositionSurfaceForHandle([in] HANDLE swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateCompositionSurfaceForSwapChain([in] IUnknown *swapchain, [out, retval] ICompositionSurface **result); + HRESULT CreateGraphicsDevice([in] IUnknown *device, [out, retval] ICompositionGraphicsDevice **result); + }; +}

1 0

Piotr Caban : wineps: Handle EMR_GRADIENTFILL record in spool files.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: b51d9e2cfbf7c628ec2a886461cf87026d2737b8 URL: https://gitlab.winehq.org/wine/wine/-/commit/b51d9e2cfbf7c628ec2a886461cf87… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:49:38 2023 +0200 wineps: Handle EMR_GRADIENTFILL record in spool files. --- dlls/wineps.drv/printproc.c | 133 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 133 insertions(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a48b2d3c273..f38a6b1d67d 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -800,6 +800,132 @@ static int poly_draw(PHYSDEV dev, const POINT *points, const BYTE *types, DWORD return TRUE; } +static inline void reset_bounds(RECT *bounds) +{ + bounds->left = bounds->top = INT_MAX; + bounds->right = bounds->bottom = INT_MIN; +} + +static BOOL gradient_fill(PHYSDEV dev, const TRIVERTEX *vert_array, DWORD nvert, + const void *grad_array, DWORD ngrad, ULONG mode) +{ + char buffer[FIELD_OFFSET(BITMAPINFO, bmiColors[256])]; + BITMAPINFO *info = (BITMAPINFO *)buffer; + struct bitblt_coords src, dst; + struct gdi_image_bits bits; + HBITMAP bmp, old_bmp; + BOOL ret = FALSE; + TRIVERTEX *pts; + unsigned int i; + HDC hdc_src; + HRGN rgn; + + if (!(pts = malloc(nvert * sizeof(*pts)))) return FALSE; + memcpy(pts, vert_array, sizeof(*pts) * nvert); + for (i = 0; i < nvert; i++) + LPtoDP(dev->hdc, (POINT *)&pts[i], 1); + + /* compute bounding rect of all the rectangles/triangles */ + reset_bounds(&dst.visrect); + for (i = 0; i < ngrad * (mode == GRADIENT_FILL_TRIANGLE ? 3 : 2); i++) + { + ULONG v = ((ULONG *)grad_array)[i]; + dst.visrect.left = min(dst.visrect.left, pts[v].x); + dst.visrect.top = min(dst.visrect.top, pts[v].y); + dst.visrect.right = max(dst.visrect.right, pts[v].x); + dst.visrect.bottom = max(dst.visrect.bottom, pts[v].y); + } + + dst.x = dst.visrect.left; + dst.y = dst.visrect.top; + dst.width = dst.visrect.right - dst.visrect.left; + dst.height = dst.visrect.bottom - dst.visrect.top; + clip_visrect(dev->hdc, &dst.visrect, &dst.visrect); + + info->bmiHeader.biSize = sizeof(info->bmiHeader); + info->bmiHeader.biPlanes = 1; + info->bmiHeader.biBitCount = 24; + info->bmiHeader.biCompression = BI_RGB; + info->bmiHeader.biXPelsPerMeter = 0; + info->bmiHeader.biYPelsPerMeter = 0; + info->bmiHeader.biClrUsed = 0; + info->bmiHeader.biClrImportant = 0; + info->bmiHeader.biWidth = dst.visrect.right - dst.visrect.left; + info->bmiHeader.biHeight = dst.visrect.bottom - dst.visrect.top; + info->bmiHeader.biSizeImage = 0; + memset(&bits, 0, sizeof(bits)); + hdc_src = CreateCompatibleDC(NULL); + if (!hdc_src) + { + free(pts); + return FALSE; + } + bmp = CreateDIBSection(hdc_src, info, DIB_RGB_COLORS, &bits.ptr, NULL, 0); + if (!bmp) + { + DeleteObject(hdc_src); + free(pts); + return FALSE; + } + old_bmp = SelectObject(hdc_src, bmp); + + /* make src and points relative to the bitmap */ + src = dst; + src.x -= dst.visrect.left; + src.y -= dst.visrect.top; + OffsetRect(&src.visrect, -dst.visrect.left, -dst.visrect.top); + for (i = 0; i < nvert; i++) + { + pts[i].x -= dst.visrect.left; + pts[i].y -= dst.visrect.top; + } + ret = GdiGradientFill(hdc_src, pts, nvert, (void *)grad_array, ngrad, mode); + SelectObject(hdc_src, old_bmp); + DeleteObject(hdc_src); + + rgn = CreateRectRgn(0, 0, 0, 0); + if (mode == GRADIENT_FILL_TRIANGLE) + { + const GRADIENT_TRIANGLE *gt = grad_array; + POINT triangle[3]; + HRGN tmp; + + for (i = 0; i < ngrad; i++) + { + triangle[0].x = pts[gt[i].Vertex1].x; + triangle[0].y = pts[gt[i].Vertex1].y; + triangle[1].x = pts[gt[i].Vertex2].x; + triangle[1].y = pts[gt[i].Vertex2].y; + triangle[2].x = pts[gt[i].Vertex3].x; + triangle[2].y = pts[gt[i].Vertex3].y; + tmp = CreatePolygonRgn(triangle, 3, ALTERNATE); + CombineRgn(rgn, rgn, tmp, RGN_OR); + DeleteObject(tmp); + } + } + else + { + const GRADIENT_RECT *gr = grad_array; + HRGN tmp = CreateRectRgn(0, 0, 0, 0); + + for (i = 0; i < ngrad; i++) + { + SetRectRgn(tmp, pts[gr[i].UpperLeft].x, pts[gr[i].UpperLeft].y, + pts[gr[i].LowerRight].x, pts[gr[i].LowerRight].y); + CombineRgn(rgn, rgn, tmp, RGN_OR); + } + DeleteObject(tmp); + } + free(pts); + + OffsetRgn(rgn, dst.visrect.left, dst.visrect.top); + if (ret) + ret = (PSDRV_PutImage(dev, rgn, info, &bits, &src, &dst, SRCCOPY) == ERROR_SUCCESS); + DeleteObject(rgn); + DeleteObject(bmp); + return ret; +} + static HGDIOBJ get_object_handle(struct pp_data *data, HANDLETABLE *handletable, DWORD i, struct brush_pattern **pattern) { @@ -1332,6 +1458,13 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, data->patterns[p->ihBrush].bits.ptr = (BYTE *)p + p->offBits; return 1; } + case EMR_GRADIENTFILL: + { + const EMRGRADIENTFILL *p = (const EMRGRADIENTFILL *)rec; + + return gradient_fill(&data->pdev->dev, p->Ver, p->nVer, + p->Ver + p->nVer, p->nTri, p->ulMode); + } case EMR_SETWINDOWEXTEX: case EMR_SETWINDOWORGEX:

1 0

Piotr Caban : wineps: Don't write invisible parts of image to decrease output file size.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: ce3604bf58e298e2c56f7114df81887567a1889c URL: https://gitlab.winehq.org/wine/wine/-/commit/ce3604bf58e298e2c56f7114df8188… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:47:43 2023 +0200 wineps: Don't write invisible parts of image to decrease output file size. --- dlls/wineps.drv/printproc.c | 111 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 109 insertions(+), 2 deletions(-) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index f4eb2fd9eb0..3b7de50985f 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -173,6 +173,111 @@ static inline void get_bounding_rect(RECT *rect, int x, int y, int width, int he } } +static inline void order_rect(RECT *rect) +{ + if (rect->left > rect->right) + { + int tmp = rect->left; + rect->left = rect->right; + rect->right = tmp; + } + if (rect->top > rect->bottom) + { + int tmp = rect->top; + rect->top = rect->bottom; + rect->bottom = tmp; + } +} + +static BOOL intersect_vis_rectangles(struct bitblt_coords *dst, struct bitblt_coords *src) +{ + RECT rect; + + /* intersect the rectangles */ + + if ((src->width == dst->width) && (src->height == dst->height)) /* no stretching */ + { + OffsetRect(&src->visrect, dst->x - src->x, dst->y - src->y); + if (!IntersectRect(&rect, &src->visrect, &dst->visrect)) return FALSE; + src->visrect = dst->visrect = rect; + OffsetRect(&src->visrect, src->x - dst->x, src->y - dst->y); + } + else /* stretching */ + { + /* map source rectangle into destination coordinates */ + rect = src->visrect; + OffsetRect(&rect, + -src->x - (src->width < 0 ? 1 : 0), + -src->y - (src->height < 0 ? 1 : 0)); + rect.left = rect.left * dst->width / src->width; + rect.top = rect.top * dst->height / src->height; + rect.right = rect.right * dst->width / src->width; + rect.bottom = rect.bottom * dst->height / src->height; + order_rect(&rect); + + /* when the source rectangle needs to flip and it doesn't fit in the source device + area, the destination area isn't flipped. So, adjust destination coordinates */ + if (src->width < 0 && dst->width > 0 && + (src->x + src->width + 1 < src->visrect.left || src->x > src->visrect.right)) + dst->x += (dst->width - rect.right) - rect.left; + else if (src->width > 0 && dst->width < 0 && + (src->x < src->visrect.left || src->x + src->width > src->visrect.right)) + dst->x -= rect.right - (dst->width - rect.left); + + if (src->height < 0 && dst->height > 0 && + (src->y + src->height + 1 < src->visrect.top || src->y > src->visrect.bottom)) + dst->y += (dst->height - rect.bottom) - rect.top; + else if (src->height > 0 && dst->height < 0 && + (src->y < src->visrect.top || src->y + src->height > src->visrect.bottom)) + dst->y -= rect.bottom - (dst->height - rect.top); + + OffsetRect(&rect, dst->x, dst->y); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!IntersectRect(&dst->visrect, &rect, &dst->visrect)) return FALSE; + + /* map destination rectangle back to source coordinates */ + rect = dst->visrect; + OffsetRect(&rect, + -dst->x - (dst->width < 0 ? 1 : 0), + -dst->y - (dst->height < 0 ? 1 : 0)); + rect.left = src->x + rect.left * src->width / dst->width; + rect.top = src->y + rect.top * src->height / dst->height; + rect.right = src->x + rect.right * src->width / dst->width; + rect.bottom = src->y + rect.bottom * src->height / dst->height; + order_rect(&rect); + + /* avoid rounding errors */ + rect.left--; + rect.top--; + rect.right++; + rect.bottom++; + if (!IntersectRect(&src->visrect, &rect, &src->visrect)) return FALSE; + } + return TRUE; +} + +static void clip_visrect(HDC hdc, RECT *dst, const RECT *src) +{ + HRGN hrgn; + + hrgn = CreateRectRgn(0, 0, 0, 0); + if (GetRandomRgn(hdc, hrgn, 3) == 1) + { + GetRgnBox(hrgn, dst); + IntersectRect(dst, dst, src); + } + else + { + *dst = *src; + } + DeleteObject(hrgn); +} + static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, const XFORM *xform, DWORD width, DWORD height, struct bitblt_coords *src) { @@ -193,7 +298,7 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, dst->width = -dst->width; } get_bounding_rect(&rect, dst->x, dst->y, dst->width, dst->height); - dst->visrect = rect; + clip_visrect(hdc, &dst->visrect, &rect); if (!src) return; @@ -206,8 +311,10 @@ static void get_vis_rectangles(HDC hdc, struct bitblt_coords *dst, src->y = rect.top; src->width = rect.right - rect.left; src->height = rect.bottom - rect.top; - get_bounding_rect( &rect, src->x, src->y, src->width, src->height ); + get_bounding_rect(&rect, src->x, src->y, src->width, src->height); src->visrect = rect; + + intersect_vis_rectangles(dst, src); } static int stretch_blt(PHYSDEV dev, const EMRSTRETCHBLT *blt,

1 0

Piotr Caban : wineps: Handle EMR_EXTSELECTCLIPRGN record in spool files.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 2929ce9b75c1b84f55cd519c30fc0d30d3d6fee5 URL: https://gitlab.winehq.org/wine/wine/-/commit/2929ce9b75c1b84f55cd519c30fc0d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:44:13 2023 +0200 wineps: Handle EMR_EXTSELECTCLIPRGN record in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index a71f6a6aece..a48b2d3c273 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1353,6 +1353,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: case EMR_SELECTCLIPPATH: + case EMR_EXTSELECTCLIPRGN: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Piotr Caban : wineps: Handle EMR_SELECTCLIPPATH in spool files.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 672088477f1bbb6a61d6b606ff587a69c3c00d3a URL: https://gitlab.winehq.org/wine/wine/-/commit/672088477f1bbb6a61d6b606ff587a… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Apr 13 09:43:16 2023 +0200 wineps: Handle EMR_SELECTCLIPPATH in spool files. --- dlls/wineps.drv/printproc.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dlls/wineps.drv/printproc.c b/dlls/wineps.drv/printproc.c index 3b7de50985f..a71f6a6aece 100644 --- a/dlls/wineps.drv/printproc.c +++ b/dlls/wineps.drv/printproc.c @@ -1352,6 +1352,7 @@ static int WINAPI hmf_proc(HDC hdc, HANDLETABLE *htable, case EMR_CREATEPEN: case EMR_CREATEBRUSHINDIRECT: case EMR_SETARCDIRECTION: + case EMR_SELECTCLIPPATH: return PlayEnhMetaFileRecord(data->pdev->dev.hdc, htable, rec, n); default: FIXME("unsupported record: %ld\n", rec->iType);

1 0

Mohamad Al-Jaf : widl: Add support for WinRT HANDLE parameter type.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 3b31e75395ec49899102a87b12351632489d03ea URL: https://gitlab.winehq.org/wine/wine/-/commit/3b31e75395ec49899102a87b123516… Author: Mohamad Al-Jaf <mohamadaljaf(a)gmail.com> Date: Sat Apr 8 21:18:48 2023 -0400 widl: Add support for WinRT HANDLE parameter type. Needed by windows.ui.composition.interop.idl. --- tools/widl/parser.y | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tools/widl/parser.y b/tools/widl/parser.y index 9b81f9521fa..b802f75874d 100644 --- a/tools/widl/parser.y +++ b/tools/widl/parser.y @@ -2481,8 +2481,12 @@ static void check_field_common(const type_t *container_type, break; } case TGT_POINTER: - type = type_pointer_get_ref_type(type); - more_to_do = TRUE; + if (type_get_type(type_pointer_get_ref_type(type)) != TYPE_VOID || + !type->name || strcmp(type->name, "HANDLE")) + { + type = type_pointer_get_ref_type(type); + more_to_do = TRUE; + } break; case TGT_ARRAY: type = type_array_get_element_type(type);

1 0

Alexandre Julliard : ntdll: Use the correct section start when reading the COR header.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: wine Branch: master Commit: 738b6c00a99aa90fbb8895a22b889ea3ac04034a URL: https://gitlab.winehq.org/wine/wine/-/commit/738b6c00a99aa90fbb8895a22b889e… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Apr 12 14:01:29 2023 +0200 ntdll: Use the correct section start when reading the COR header. --- dlls/ntdll/loader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index f05cd1b4fd9..ce8b3bcba4d 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -2286,7 +2286,7 @@ static BOOL get_cor_header( HANDLE file, const SECTION_IMAGE_INFORMATION *info, { if (va < sec[i].VirtualAddress) continue; if (sec[i].Misc.VirtualSize && va - sec[i].VirtualAddress >= sec[i].Misc.VirtualSize) continue; - offset.QuadPart = sec->PointerToRawData + va - sec[i].VirtualAddress; + offset.QuadPart = sec[i].PointerToRawData + va - sec[i].VirtualAddress; if (NtReadFile( file, 0, NULL, NULL, &io, cor, sizeof(*cor), &offset, NULL )) return FALSE; return (io.Information == sizeof(*cor)); }

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log() intrinsic.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: a1bd4e080ef5bd0b1bfb073558fb715e9ad54058 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/a1bd4e080ef5bd0b1bfb073558fb7… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:15:50 2023 +0100 vkd3d-shader/hlsl: Support log() intrinsic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ tests/log.shader_test | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index e487902e..ce20c00e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,25 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *coeff; + struct hlsl_ir_node *log, *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc))) + return false; + + /* ln(2) */ + if (!(coeff = hlsl_new_float_constant(ctx, 0.69314718055f, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, &coeff->node, loc); +} + static bool intrinsic_log10(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3330,6 +3349,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log", 1, true, intrinsic_log}, {"log10", 1, true, intrinsic_log10}, {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, diff --git a/tests/log.shader_test b/tests/log.shader_test index 0a99904a..b0f405d1 100644 --- a/tests/log.shader_test +++ b/tests/log.shader_test @@ -23,3 +23,16 @@ float4 main() : sv_target uniform 0 float4 10.0 100.0 1.0 0.1 draw quad probe all rgba (1.0, 2.0, 0.0, -1.0) 1 + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log(x); +} + +[test] +uniform 0 float4 3.0 10.0 1.0 0.1 +draw quad +probe all rgba (1.0986123, 2.302585, 0.0, -2.302585) 2

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log10() intrinsic.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 210caa931db664e2c9fdcff217581fd4bf421e9c URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/210caa931db664e2c9fdcff217581… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:14:45 2023 +0100 vkd3d-shader/hlsl: Support log10() intrinsic. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.y | 20 ++++++++++++++++++++ tests/log.shader_test | 13 +++++++++++++ 2 files changed, 33 insertions(+) diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index f2990e6f..e487902e 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,25 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log10(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_constant *coeff; + struct hlsl_ir_node *log, *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + if (!(log = add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc))) + return false; + + /* 1 / log2(10) */ + if (!(coeff = hlsl_new_float_constant(ctx, 0.301029996f, loc))) + return false; + + return !!add_binary_arithmetic_expr(ctx, params->instrs, HLSL_OP2_MUL, log, &coeff->node, loc); +} + static bool intrinsic_log2(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3311,6 +3330,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log10", 1, true, intrinsic_log10}, {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, diff --git a/tests/log.shader_test b/tests/log.shader_test index 9ba0af76..0a99904a 100644 --- a/tests/log.shader_test +++ b/tests/log.shader_test @@ -10,3 +10,16 @@ float4 main() : sv_target uniform 0 float4 2.0 4.0 5.0 0.4 draw quad probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1 + +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log10(x); +} + +[test] +uniform 0 float4 10.0 100.0 1.0 0.1 +draw quad +probe all rgba (1.0, 2.0, 0.0, -1.0) 1

1 0

Nikolay Sivov : vkd3d-shader/hlsl: Support log2() intrinsic.
by Alexandre Julliard April 13, 2023

April 13, 2023

Module: vkd3d Branch: master Commit: 49b63fbeba6d0665fa8ced7d2e2dd4376c98deb9 URL: https://gitlab.winehq.org/wine/vkd3d/-/commit/49b63fbeba6d0665fa8ced7d2e2dd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Feb 21 23:13:24 2023 +0100 vkd3d-shader/hlsl: Support log2() intrinsic. --- Makefile.am | 1 + libs/vkd3d-shader/hlsl.y | 12 ++++++++++++ tests/log.shader_test | 12 ++++++++++++ 3 files changed, 25 insertions(+) diff --git a/Makefile.am b/Makefile.am index 48991982..a7abd56a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -122,6 +122,7 @@ vkd3d_shader_tests = \ tests/hlsl-vector-indexing.shader_test \ tests/hlsl-vector-indexing-uniform.shader_test \ tests/lit.shader_test \ + tests/log.shader_test \ tests/logic-operations.shader_test \ tests/majority-syntax.shader_test \ tests/math.shader_test \ diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 3873a939..f2990e6f 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -2843,6 +2843,17 @@ static bool intrinsic_lit(struct hlsl_ctx *ctx, return true; } +static bool intrinsic_log2(struct hlsl_ctx *ctx, + const struct parse_initializer *params, const struct vkd3d_shader_location *loc) +{ + struct hlsl_ir_node *arg; + + if (!(arg = intrinsic_float_convert_arg(ctx, params, params->args[0], loc))) + return false; + + return !!add_unary_arithmetic_expr(ctx, params->instrs, HLSL_OP1_LOG2, arg, loc); +} + static bool intrinsic_max(struct hlsl_ctx *ctx, const struct parse_initializer *params, const struct vkd3d_shader_location *loc) { @@ -3300,6 +3311,7 @@ intrinsic_functions[] = {"length", 1, true, intrinsic_length}, {"lerp", 3, true, intrinsic_lerp}, {"lit", 3, true, intrinsic_lit}, + {"log2", 1, true, intrinsic_log2}, {"max", 2, true, intrinsic_max}, {"min", 2, true, intrinsic_min}, {"mul", 2, true, intrinsic_mul}, diff --git a/tests/log.shader_test b/tests/log.shader_test new file mode 100644 index 00000000..9ba0af76 --- /dev/null +++ b/tests/log.shader_test @@ -0,0 +1,12 @@ +[pixel shader] +uniform float4 x; + +float4 main() : sv_target +{ + return log2(x); +} + +[test] +uniform 0 float4 2.0 4.0 5.0 0.4 +draw quad +probe all rgba (1.0, 2.0, 2.32192802, -1.32192802) 1

1 0