June 2020 - Wine-Commits - list.winehq.org

Dmitry Timoshkov : prntvpt: Add support for PageResolution to ticket XML writer.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 0b53ba31f9ff7696013bf45113cafb5f60ce026b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0b53ba31f9ff7696013bf451… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Wed Jun 17 13:22:09 2020 +0800 prntvpt: Add support for PageResolution to ticket XML writer. Signed-off-by: Dmitry Timoshkov <dmitry(a)baikal.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/prntvpt/ticket.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/dlls/prntvpt/ticket.c b/dlls/prntvpt/ticket.c index e90dc5100b..b9dfdb10ae 100644 --- a/dlls/prntvpt/ticket.c +++ b/dlls/prntvpt/ticket.c @@ -889,6 +889,34 @@ static HRESULT write_PageScaling(IXMLDOMElement *root, const struct ticket *tick return hr; } +static HRESULT write_PageResolution(IXMLDOMElement *root, const struct ticket *ticket) +{ + IXMLDOMElement *feature, *option = NULL, *property; + HRESULT hr; + + hr = create_Feature(root, L"psk:PageResolution", &feature); + if (hr != S_OK) return hr; + + hr = create_Option(feature, NULL, &option); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionX", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.x); + IXMLDOMElement_Release(property); + if (hr != S_OK) goto fail; + + hr = create_ScoredProperty(option, L"psk:ResolutionY", &property); + if (hr != S_OK) goto fail; + hr = write_int_value(property, ticket->page.resolution.y); + IXMLDOMElement_Release(property); + +fail: + if (option) IXMLDOMElement_Release(option); + IXMLDOMElement_Release(feature); + return hr; +} + static HRESULT write_attributes(IXMLDOMElement *element) { HRESULT hr; @@ -932,6 +960,8 @@ static HRESULT write_ticket(IStream *stream, const struct ticket *ticket, EPrint if (hr != S_OK) goto fail; hr = write_PageScaling(root, ticket); if (hr != S_OK) goto fail; + hr = write_PageResolution(root, ticket); + if (hr != S_OK) goto fail; hr = IStream_Write(stream, xmldecl, strlen(xmldecl), NULL); if (hr != S_OK) goto fail;

1 0

Brendan Shanks : winhttp: Treat a partial certificate chain as having an unknown/invalid CA.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: aa80ef20504660fa55914d40fb4bb296eef94c59 URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa80ef20504660fa55914d40… Author: Brendan Shanks <bshanks(a)codeweavers.com> Date: Tue Jun 16 13:48:22 2020 -0700 winhttp: Treat a partial certificate chain as having an unknown/invalid CA. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46726 Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com> Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winhttp/net.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/dlls/winhttp/net.c b/dlls/winhttp/net.c index 2905d5c535..0cc2bb2bef 100644 --- a/dlls/winhttp/net.c +++ b/dlls/winhttp/net.c @@ -84,8 +84,10 @@ static DWORD netconn_verify_cert( PCCERT_CONTEXT cert, WCHAR *server, DWORD secu if (!(security_flags & SECURITY_FLAG_IGNORE_CERT_DATE_INVALID)) err = ERROR_WINHTTP_SECURE_CERT_DATE_INVALID; } - else if (chain->TrustStatus.dwErrorStatus & - CERT_TRUST_IS_UNTRUSTED_ROOT) + else if ((chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_UNTRUSTED_ROOT) || + (chain->TrustStatus.dwErrorStatus & + CERT_TRUST_IS_PARTIAL_CHAIN)) { if (!(security_flags & SECURITY_FLAG_IGNORE_UNKNOWN_CA)) err = ERROR_WINHTTP_SECURE_INVALID_CA;

1 0

Jeff Smith : gdiplus/tests: Test that hatch fill uses rendering origin.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: 03cefac99bfb405fe054ca3ddcb513402a744985 URL: https://source.winehq.org/git/wine.git/?a=commit;h=03cefac99bfb405fe054ca3d… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jun 16 15:04:16 2020 -0500 gdiplus/tests: Test that hatch fill uses rendering origin. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/tests/brush.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++ include/gdiplusflat.h | 1 + 2 files changed, 94 insertions(+) diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index fca1c17057..8e0d7e9ca0 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1778,6 +1778,98 @@ static void test_hatchBrushStyles(void) ReleaseDC(hwnd, hdc); } +static void test_renderingOrigin(void) +{ + static const int width = 8, height = 8; + GpStatus status; + HDC hdc; + GpBitmap *bitmap; + GpGraphics *graphics_hdc; + GpGraphics *graphics_image; + GpHatch *brush; + BOOL match_hdc; + BOOL match_image; + static const INT tests[][2] = {{3, 6}, {-7, -4}}; + static const ARGB fore_color = 0xff000000; + static const ARGB back_color = 0xffffffff; + INT x, y; + int i; + + hdc = GetDC(hwnd); + GdipCreateFromHDC(hdc, &graphics_hdc); + + GdipCreateBitmapFromScan0(width, height, 0, PixelFormat32bppRGB, NULL, &bitmap); + GdipGetImageGraphicsContext((GpImage *)bitmap, &graphics_image); + + GdipCreateHatchBrush(HatchStyleCross, fore_color, back_color, &brush); + + x = y = 0xdeadbeef; + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == 0 && y == 0, "Expected (%d, %d) got (%d, %d)\n", 0, 0, x, y); + x = y = 0xdeadbeef; + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == 0 && y == 0, "Expected (%d, %d) got (%d, %d)\n", 0, 0, x, y); + + for (i = 0; i < ARRAY_SIZE(tests); i++) + { + const INT exp_x = ((tests[i][0] % 8) + 8) % 8; + const INT exp_y = ((tests[i][1] % 8) + 8) % 8; + + status = GdipSetRenderingOrigin(graphics_image, tests[i][0], tests[i][1]); + expect(Ok, status); + status = GdipSetRenderingOrigin(graphics_hdc, tests[i][0], tests[i][1]); + expect(Ok, status); + + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == tests[i][0] && y == tests[i][1], "Expected (%d, %d) got (%d, %d)\n", + tests[i][0], tests[i][1], x, y); + status = GdipGetRenderingOrigin(graphics_image, &x, &y); + expect(Ok, status); + ok(x == tests[i][0] && y == tests[i][1], "Expected (%d, %d) got (%d, %d)\n", + tests[i][0], tests[i][1], x, y); + + GdipFillRectangleI(graphics_image, (GpBrush *)brush, 0, 0, width, height); + GdipFillRectangleI(graphics_hdc, (GpBrush *)brush, 0, 0, width, height); + + match_hdc = TRUE; + match_image = TRUE; + for (y = 0; y < height && (match_hdc || match_image); y++) + { + for (x = 0; x < width && (match_hdc || match_image); x++) + { + ARGB color; + const ARGB exp_color = (x == exp_x || y == exp_y) ? fore_color : back_color; + + color = COLORREF2ARGB(GetPixel(hdc, x, y)); + if (color != exp_color) + match_hdc = FALSE; + + GdipBitmapGetPixel(bitmap, x, y, &color); + if (color != exp_color) + match_image = FALSE; + } + } + todo_wine + { + ok(match_hdc, "Hatch brush rendered incorrectly on hdc with rendering origin (%d, %d).\n", + tests[i][0], tests[i][1]); + ok(match_image, "Hatch brush rendered incorrectly on image with rendering origin (%d, %d).\n", + tests[i][0], tests[i][1]); + } + } + + GdipDeleteBrush((GpBrush *)brush); + + GdipDeleteGraphics(graphics_image); + GdipDisposeImage((GpImage*)bitmap); + + GdipDeleteGraphics(graphics_hdc); + ReleaseDC(hwnd, hdc); +} + START_TEST(brush) { struct GdiplusStartupInput gdiplusStartupInput; @@ -1831,6 +1923,7 @@ START_TEST(brush) test_pathgradientblend(); test_getHatchStyle(); test_hatchBrushStyles(); + test_renderingOrigin(); GdiplusShutdown(gdiplusToken); DestroyWindow(hwnd); diff --git a/include/gdiplusflat.h b/include/gdiplusflat.h index b7da5427d4..1526ce0338 100644 --- a/include/gdiplusflat.h +++ b/include/gdiplusflat.h @@ -258,6 +258,7 @@ GpStatus WINGDIPAPI GdipGetNearestColor(GpGraphics*,ARGB*); GpStatus WINGDIPAPI GdipGetPageScale(GpGraphics*,REAL*); GpStatus WINGDIPAPI GdipGetPageUnit(GpGraphics*,GpUnit*); GpStatus WINGDIPAPI GdipGetPixelOffsetMode(GpGraphics*,PixelOffsetMode*); +GpStatus WINGDIPAPI GdipGetRenderingOrigin(GpGraphics*,INT*,INT*); GpStatus WINGDIPAPI GdipGetSmoothingMode(GpGraphics*,SmoothingMode*); GpStatus WINGDIPAPI GdipGetTextContrast(GpGraphics*,UINT*); GpStatus WINGDIPAPI GdipGetTextRenderingHint(GpGraphics*,TextRenderingHint*);

1 0

Jeff Smith : gdiplus: Handle rendering origin during hatch fill.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: wine Branch: master Commit: da915074910bd7c50d579af145d050e13483df00 URL: https://source.winehq.org/git/wine.git/?a=commit;h=da915074910bd7c50d579af1… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jun 16 15:04:17 2020 -0500 gdiplus: Handle rendering origin during hatch fill. Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Esme Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/graphics.c | 31 ++++++++++++++----------------- dlls/gdiplus/tests/brush.c | 3 --- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/dlls/gdiplus/graphics.c b/dlls/gdiplus/graphics.c index 1ed29d1094..6619be9b58 100644 --- a/dlls/gdiplus/graphics.c +++ b/dlls/gdiplus/graphics.c @@ -127,7 +127,7 @@ static void init_hatch_palette(ARGB *hatch_palette, ARGB fore_color, ARGB back_c hatch_palette[3] = fore_color; } -static HBITMAP create_hatch_bitmap(const GpHatch *hatch) +static HBITMAP create_hatch_bitmap(const GpHatch *hatch, INT origin_x, INT origin_y) { HBITMAP hbmp; BITMAPINFOHEADER bmih; @@ -159,7 +159,9 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch) * degree of shading needed. */ for (y = 0; y < 8; y++) { - unsigned int row = 0x101 * hatch_data[y]; + const int hy = (((y + origin_y) % 8) + 8) % 8; + const int hx = ((origin_x % 8) + 8) % 8; + unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < 8; x++, row >>= 1) { @@ -184,7 +186,7 @@ static HBITMAP create_hatch_bitmap(const GpHatch *hatch) return hbmp; } -static GpStatus create_gdi_logbrush(const GpBrush *brush, LOGBRUSH *lb) +static GpStatus create_gdi_logbrush(const GpBrush *brush, LOGBRUSH *lb, INT origin_x, INT origin_y) { switch (brush->bt) { @@ -202,7 +204,7 @@ static GpStatus create_gdi_logbrush(const GpBrush *brush, LOGBRUSH *lb) const GpHatch *hatch = (const GpHatch *)brush; HBITMAP hbmp; - hbmp = create_hatch_bitmap(hatch); + hbmp = create_hatch_bitmap(hatch, origin_x, origin_y); if (!hbmp) return OutOfMemory; lb->lbStyle = BS_PATTERN; @@ -231,12 +233,12 @@ static GpStatus free_gdi_logbrush(LOGBRUSH *lb) return Ok; } -static HBRUSH create_gdi_brush(const GpBrush *brush) +static HBRUSH create_gdi_brush(const GpBrush *brush, INT origin_x, INT origin_y) { LOGBRUSH lb; HBRUSH gdibrush; - if (create_gdi_logbrush(brush, &lb) != Ok) return 0; + if (create_gdi_logbrush(brush, &lb, origin_x, origin_y) != Ok) return 0; gdibrush = CreateBrushIndirect(&lb); free_gdi_logbrush(&lb); @@ -293,14 +295,14 @@ static INT prepare_dc(GpGraphics *graphics, GpPen *pen) } TRACE("\n and the pen style is %x\n", pen->style); - create_gdi_logbrush(pen->brush, &lb); + create_gdi_logbrush(pen->brush, &lb, graphics->origin_x, graphics->origin_y); gdipen = ExtCreatePen(pen->style, gdip_round(width), &lb, numdashes, dash_array); free_gdi_logbrush(&lb); } else { - create_gdi_logbrush(pen->brush, &lb); + create_gdi_logbrush(pen->brush, &lb, graphics->origin_x, graphics->origin_y); gdipen = ExtCreatePen(pen->style, gdip_round(width), &lb, 0, NULL); free_gdi_logbrush(&lb); } @@ -1134,7 +1136,7 @@ static GpStatus brush_fill_path(GpGraphics *graphics, GpBrush *brush) { HBRUSH gdibrush, old_brush; - gdibrush = create_gdi_brush(brush); + gdibrush = create_gdi_brush(brush, graphics->origin_x, graphics->origin_y); if (!gdibrush) { status = OutOfMemory; @@ -1196,9 +1198,9 @@ static GpStatus brush_fill_pixels(GpGraphics *graphics, GpBrush *brush, /* See create_hatch_bitmap for an explanation of how index is derived. */ for (y = 0; y < fill_area->Height; y++, argb_pixels += cdwStride) { - /* FIXME: Account for the rendering origin */ - const int hy = 7 - ((y + fill_area->Y) % 8); - const unsigned int row = 0x101 * hatch_data[hy]; + const int hy = (7 - ((y + fill_area->Y - graphics->origin_y) % 8)) % 8; + const int hx = ((graphics->origin_x % 8) + 8) % 8; + const unsigned int row = (0x10101 * hatch_data[hy]) >> hx; for (x = 0; x < fill_area->Width; x++) { @@ -6193,13 +6195,8 @@ GpStatus WINGDIPAPI GdipSetPixelOffsetMode(GpGraphics *graphics, PixelOffsetMode GpStatus WINGDIPAPI GdipSetRenderingOrigin(GpGraphics *graphics, INT x, INT y) { - static int calls; - TRACE("(%p,%i,%i)\n", graphics, x, y); - if (!(calls++)) - FIXME("value is unused in rendering\n"); - if (!graphics) return InvalidParameter; diff --git a/dlls/gdiplus/tests/brush.c b/dlls/gdiplus/tests/brush.c index 8e0d7e9ca0..5d5280c7f9 100644 --- a/dlls/gdiplus/tests/brush.c +++ b/dlls/gdiplus/tests/brush.c @@ -1852,13 +1852,10 @@ static void test_renderingOrigin(void) match_image = FALSE; } } - todo_wine - { ok(match_hdc, "Hatch brush rendered incorrectly on hdc with rendering origin (%d, %d).\n", tests[i][0], tests[i][1]); ok(match_image, "Hatch brush rendered incorrectly on image with rendering origin (%d, %d).\n", tests[i][0], tests[i][1]); - } } GdipDeleteBrush((GpBrush *)brush);

1 0

Henri Verbeet : vkd3d-compiler: vkd3d_shader_compile_dxbc() returns an int.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: vkd3d Branch: master Commit: cb5c0010620d574e97279fa4aebd205dd7c661db URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=cb5c0010620d574e97279fa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 17:22:16 2020 +0430 vkd3d-compiler: vkd3d_shader_compile_dxbc() returns an int. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/vkd3d-compiler/main.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 047abcd..dd94374 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -150,7 +150,7 @@ int main(int argc, char **argv) { struct vkd3d_shader_code dxbc, spirv; struct options options; - HRESULT hr; + int ret; if (!parse_command_line(argc, argv, &options)) { @@ -164,11 +164,11 @@ int main(int argc, char **argv) return 1; } - hr = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); + ret = vkd3d_shader_compile_dxbc(&dxbc, &spirv, options.compiler_options, NULL, NULL); vkd3d_shader_free_shader_code(&dxbc); - if (FAILED(hr)) + if (ret < 0) { - fprintf(stderr, "Failed to compile DXBC shader, hr %#x.\n", hr); + fprintf(stderr, "Failed to compile DXBC shader, ret %d.\n", ret); return 1; }

1 0

Zebediah Figura : vkd3d: Index the "vk_uav_counter_views" array to match the "uav_counters" array.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: vkd3d Branch: master Commit: 671ca1e7218e7411a114dd3cdaab9391e4195cfd URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=671ca1e7218e7411a114dd3… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 17 17:22:13 2020 +0430 vkd3d: Index the "vk_uav_counter_views" array to match the "uav_counters" array. That is, index elements of vk_uav_counter_views by their index in uav_counters, rather than by their register index. This is necessary because multiple UAVs can share the same register index but differ in register space. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 33 ++++++++++++++++++++------------- libs/vkd3d/vkd3d_private.h | 2 +- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 217fcf3..b7e680e 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1865,7 +1865,7 @@ static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *li if (state && state->uav_counter_mask) { enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; - list->pipeline_bindings[bind_point].uav_counter_dirty_mask = ~(uint8_t)0; + list->pipeline_bindings[bind_point].uav_counters_dirty = true; } } @@ -2652,9 +2652,10 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list const struct vkd3d_vk_device_procs *vk_procs = &list->device->vk_procs; struct VkDescriptorImageInfo image_infos[24], *current_image_info; const struct d3d12_root_descriptor_table *descriptor_table; + const struct d3d12_pipeline_state *state = list->state; const struct d3d12_root_descriptor_table_range *range; VkDevice vk_device = list->device->vk_device; - unsigned int i, j, descriptor_count; + unsigned int i, j, k, descriptor_count; struct d3d12_desc *descriptor; descriptor_table = root_signature_get_descriptor_table(root_signature, index); @@ -2677,14 +2678,20 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list unsigned int register_idx = range->base_register_idx + j; /* Track UAV counters. */ - if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV - && register_idx < ARRAY_SIZE(bindings->vk_uav_counter_views)) + if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV - ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; - if (bindings->vk_uav_counter_views[register_idx] != vk_counter_view) - bindings->uav_counter_dirty_mask |= 1u << register_idx; - bindings->vk_uav_counter_views[register_idx] = vk_counter_view; + for (k = 0; k < vkd3d_popcount(state->uav_counter_mask); ++k) + { + if (state->uav_counters[k].register_index == register_idx) + { + VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV + ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; + if (bindings->vk_uav_counter_views[k] != vk_counter_view) + bindings->uav_counters_dirty = true; + bindings->vk_uav_counter_views[k] = vk_counter_view; + break; + } + } } if (!vk_write_descriptor_set_from_d3d12_desc(current_descriptor_write, @@ -2825,7 +2832,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma unsigned int uav_counter_count; unsigned int i; - if (!state || !(state->uav_counter_mask & bindings->uav_counter_dirty_mask)) + if (!state || !bindings->uav_counters_dirty) return; uav_counter_count = vkd3d_popcount(state->uav_counter_mask); @@ -2840,7 +2847,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma const struct vkd3d_shader_uav_counter_binding *uav_counter = &state->uav_counters[i]; const VkBufferView *vk_uav_counter_views = bindings->vk_uav_counter_views; - assert(vk_uav_counter_views[uav_counter->register_index]); + assert(vk_uav_counter_views[i]); vk_descriptor_writes[i].sType = VK_STRUCTURE_TYPE_WRITE_DESCRIPTOR_SET; vk_descriptor_writes[i].pNext = NULL; @@ -2851,7 +2858,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma vk_descriptor_writes[i].descriptorType = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER; vk_descriptor_writes[i].pImageInfo = NULL; vk_descriptor_writes[i].pBufferInfo = NULL; - vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[uav_counter->register_index]; + vk_descriptor_writes[i].pTexelBufferView = &vk_uav_counter_views[i]; } VK_CALL(vkUpdateDescriptorSets(vk_device, uav_counter_count, vk_descriptor_writes, 0, NULL)); @@ -2859,7 +2866,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma VK_CALL(vkCmdBindDescriptorSets(list->vk_command_buffer, bindings->vk_bind_point, state->vk_pipeline_layout, state->set_index, 1, &vk_descriptor_set, 0, NULL)); - bindings->uav_counter_dirty_mask = 0; + bindings->uav_counters_dirty = false; } static void d3d12_command_list_update_descriptors(struct d3d12_command_list *list, diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index fbffee5..a4d73a9 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -921,7 +921,7 @@ struct vkd3d_pipeline_bindings uint64_t descriptor_table_active_mask; VkBufferView vk_uav_counter_views[VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS]; - uint8_t uav_counter_dirty_mask; + bool uav_counters_dirty; /* Needed when VK_KHR_push_descriptor is not available. */ struct vkd3d_push_descriptor push_descriptors[D3D12_MAX_ROOT_COST / 2];

1 0

Zebediah Figura : vkd3d: Also match the UAV counter register space in d3d12_command_list_update_descriptor_table().
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: vkd3d Branch: master Commit: 57973b4252a33c870b9b43d1ed3abf5618c7ad24 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=57973b4252a33c870b9b43d… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 17 17:22:15 2020 +0430 vkd3d: Also match the UAV counter register space in d3d12_command_list_update_descriptor_table(). Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 3 ++- libs/vkd3d/state.c | 1 + libs/vkd3d/vkd3d_private.h | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index 7ff3c87..647431a 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2682,7 +2682,8 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list { for (k = 0; k < state->uav_counter_count; ++k) { - if (state->uav_counters[k].register_index == register_idx) + if (state->uav_counters[k].register_space == range->register_space + && state->uav_counters[k].register_index == register_idx) { VkBufferView vk_counter_view = descriptor->magic == VKD3D_DESCRIPTOR_MAGIC_UAV ? descriptor->u.view->vk_counter_view : VK_NULL_HANDLE; diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 44891a1..11db8b5 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -646,6 +646,7 @@ static HRESULT d3d12_root_signature_init_root_descriptor_tables(struct d3d12_roo table->ranges[j].descriptor_count = range->NumDescriptors; table->ranges[j].binding = vk_binding; table->ranges[j].descriptor_magic = vkd3d_descriptor_magic_from_d3d12(range->RangeType); + table->ranges[j].register_space = range->RegisterSpace; table->ranges[j].base_register_idx = range->BaseShaderRegister; } } diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index cf7c796..bfdc7b4 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -658,6 +658,7 @@ struct d3d12_root_descriptor_table_range uint32_t binding; uint32_t descriptor_magic; + unsigned int register_space; unsigned int base_register_idx; };

1 0

Henri Verbeet : vkd3d: Introduce our own pipeline bind point enumeration.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: vkd3d Branch: master Commit: 9b03ebde858fa3e6da5cbd404a2ee3775e6be919 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9b03ebde858fa3e6da5cbd4… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Wed Jun 17 17:22:12 2020 +0430 vkd3d: Introduce our own pipeline bind point enumeration. The VK_PIPELINE_BIND_POINT_RANGE_SIZE enumeration value was removed in Vulkan-Headers release 1.2.140. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 49 +++++++++++++++++++++++----------------------- libs/vkd3d/vkd3d_private.h | 10 +++++++++- 2 files changed, 33 insertions(+), 26 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9b03ebde858fa3e6da5…

1 0

Zebediah Figura : vkd3d: Store a count of used UAV counters instead of a mask.
by Alexandre Julliard June 17, 2020

June 17, 2020

Module: vkd3d Branch: master Commit: f0ce8aaf9268c578ad504414001236e38c7b4fb5 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=f0ce8aaf9268c578ad50441… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Wed Jun 17 17:22:14 2020 +0430 vkd3d: Store a count of used UAV counters instead of a mask. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d/command.c | 6 +++--- libs/vkd3d/state.c | 8 ++++---- libs/vkd3d/vkd3d_private.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index b7e680e..7ff3c87 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -1862,7 +1862,7 @@ static void d3d12_command_list_invalidate_current_render_pass(struct d3d12_comma static void d3d12_command_list_invalidate_bindings(struct d3d12_command_list *list, struct d3d12_pipeline_state *state) { - if (state && state->uav_counter_mask) + if (state && state->uav_counter_count) { enum vkd3d_pipeline_bind_point bind_point = (enum vkd3d_pipeline_bind_point)state->vk_bind_point; list->pipeline_bindings[bind_point].uav_counters_dirty = true; @@ -2680,7 +2680,7 @@ static void d3d12_command_list_update_descriptor_table(struct d3d12_command_list /* Track UAV counters. */ if (range->descriptor_magic == VKD3D_DESCRIPTOR_MAGIC_UAV) { - for (k = 0; k < vkd3d_popcount(state->uav_counter_mask); ++k) + for (k = 0; k < state->uav_counter_count; ++k) { if (state->uav_counters[k].register_index == register_idx) { @@ -2835,7 +2835,7 @@ static void d3d12_command_list_update_uav_counter_descriptors(struct d3d12_comma if (!state || !bindings->uav_counters_dirty) return; - uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + uav_counter_count = state->uav_counter_count; assert(uav_counter_count <= ARRAY_SIZE(vk_descriptor_writes)); vk_descriptor_set = d3d12_command_allocator_allocate_descriptor_set(list->allocator, state->vk_set_layout); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index a7b6251..44891a1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1418,7 +1418,7 @@ static HRESULT d3d12_pipeline_state_init_compute_uav_counters(struct d3d12_pipel vkd3d_free(binding_desc); return E_OUTOFMEMORY; } - state->uav_counter_mask = shader_info->uav_counter_mask; + state->uav_counter_count = uav_counter_count; memset(&context, 0, sizeof(context)); if (root_signature->vk_push_set_layout) @@ -1495,7 +1495,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; - state->uav_counter_mask = 0; + state->uav_counter_count = 0; if (!(root_signature = unsafe_impl_from_ID3D12RootSignature(desc->pRootSignature))) { @@ -1529,7 +1529,7 @@ static HRESULT d3d12_pipeline_state_init_compute(struct d3d12_pipeline_state *st shader_interface.combined_samplers = NULL; shader_interface.combined_sampler_count = 0; shader_interface.uav_counters = state->uav_counters; - shader_interface.uav_counter_count = vkd3d_popcount(state->uav_counter_mask); + shader_interface.uav_counter_count = state->uav_counter_count; vk_pipeline_layout = state->vk_pipeline_layout ? state->vk_pipeline_layout : root_signature->vk_pipeline_layout; @@ -2041,7 +2041,7 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s state->vk_pipeline_layout = VK_NULL_HANDLE; state->vk_set_layout = VK_NULL_HANDLE; state->uav_counters = NULL; - state->uav_counter_mask = 0; + state->uav_counter_count = 0; graphics->stage_count = 0; memset(&input_signature, 0, sizeof(input_signature)); diff --git a/libs/vkd3d/vkd3d_private.h b/libs/vkd3d/vkd3d_private.h index a4d73a9..cf7c796 100644 --- a/libs/vkd3d/vkd3d_private.h +++ b/libs/vkd3d/vkd3d_private.h @@ -797,7 +797,7 @@ struct d3d12_pipeline_state uint32_t set_index; struct vkd3d_shader_uav_counter_binding *uav_counters; - uint8_t uav_counter_mask; + unsigned int uav_counter_count; struct d3d12_device *device;

1 0

Jeff Smith : d3drm/tests: Test IDirect3DRM_CreateLight().
by Alexandre Julliard June 16, 2020

June 16, 2020

Module: wine Branch: master Commit: 0132054999bca4eee5580611eff08aae322061d6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=0132054999bca4eee5580611… Author: Jeff Smith <whydoubt(a)gmail.com> Date: Tue Jun 16 22:47:38 2020 +0430 d3drm/tests: Test IDirect3DRM_CreateLight(). Signed-off-by: Jeff Smith <whydoubt(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3drm/tests/d3drm.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/dlls/d3drm/tests/d3drm.c b/dlls/d3drm/tests/d3drm.c index 87ad50a39d..d854ebcc56 100644 --- a/dlls/d3drm/tests/d3drm.c +++ b/dlls/d3drm/tests/d3drm.c @@ -2601,6 +2601,17 @@ static void test_Light(void) IDirect3DRMLight_Release(light); + hr = IDirect3DRM_CreateLight(d3drm, D3DRMLIGHT_SPOT, 0x00c0c0c0, &light); + ok(hr == D3DRM_OK, "Got unexpected hr %#x.\n", hr); + + type = IDirect3DRMLight_GetType(light); + ok(type == D3DRMLIGHT_SPOT, "Got unexpected type %#x.\n", type); + + color = IDirect3DRMLight_GetColor(light); + ok(color == 0xffc0c0c0, "Got unexpected color 0x%08x.\n", color); + + IDirect3DRMLight_Release(light); + IDirect3DRM_Release(d3drm); }

1 0