October 2018 - Wine-devel - list.winehq.org

[PATCH] d2d1/tests: Test command list resource reference.
by Nikolay Sivov 29 Oct '18

29 Oct '18

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/d2d1/tests/d2d1.c | 274 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 274 insertions(+) diff --git a/dlls/d2d1/tests/d2d1.c b/dlls/d2d1/tests/d2d1.c index 3b824709f2..b7d3bfa09c 100644 --- a/dlls/d2d1/tests/d2d1.c +++ b/dlls/d2d1/tests/d2d1.c @@ -7652,6 +7652,279 @@ static void test_skew_matrix(void) } } +static ID2D1DeviceContext *create_device_context(ID2D1Factory1 *factory, ID3D10Device1 *d3d_device) +{ + ID2D1DeviceContext *device_context; + IDXGIDevice *dxgi_device; + ID2D1Device *device; + HRESULT hr; + + hr = ID3D10Device1_QueryInterface(d3d_device, &IID_IDXGIDevice, (void **)&dxgi_device); + ok(SUCCEEDED(hr), "Failed to get IDXGIDevice interface, hr %#x.\n", hr); + + hr = ID2D1Factory1_CreateDevice(factory, dxgi_device, &device); + ok(SUCCEEDED(hr), "Failed to get ID2D1Device, hr %#x.\n", hr); + IDXGIDevice_Release(dxgi_device); + + hr = ID2D1Device_CreateDeviceContext(device, D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &device_context); + ok(SUCCEEDED(hr), "Failed to create device context, hr %#x.\n", hr); + ID2D1Device_Release(device); + + return device_context; +} + +static void test_command_list(void) +{ + static const DWORD bitmap_data[] = + { + 0xffff0000, 0xffffff00, 0xff00ff00, 0xff00ffff, + }; + static const D2D1_GRADIENT_STOP stops[] = + { + {0.0f, {1.0f, 0.0f, 0.0f, 1.0f}}, + {0.5f, {0.0f, 1.0f, 0.0f, 1.0f}}, + {1.0f, {0.0f, 0.0f, 1.0f, 1.0f}}, + }; + D2D1_RADIAL_GRADIENT_BRUSH_PROPERTIES radial_gradient_properties; + D2D1_LINEAR_GRADIENT_BRUSH_PROPERTIES linear_gradient_properties; + ID2D1DeviceContext *device_context, *device_context2; + D2D1_STROKE_STYLE_PROPERTIES stroke_desc; + ID2D1GradientStopCollection *gradient; + D2D1_BITMAP_PROPERTIES bitmap_desc; + ID2D1StrokeStyle *stroke_style; + ID2D1CommandList *command_list; + ID3D10Device1 *d3d_device; + ID2D1Geometry *geometry; + ID2D1Factory1 *factory; + ID2D1RenderTarget *rt; + D2D1_POINT_2F p0, p1; + ID2D1Bitmap *bitmap; + ID2D1Image *target; + D2D1_COLOR_F color; + ID2D1Brush *brush; + D2D1_RECT_F rect; + D2D_SIZE_U size; + ULONG refcount; + HRESULT hr; + + if (!(d3d_device = create_device())) + { + skip("Failed to create device, skipping tests.\n"); + return; + } + + if (FAILED(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED, &IID_ID2D1Factory1, NULL, (void **)&factory))) + { + win_skip("ID2D1Factory1 is not supported.\n"); + ID3D10Device1_Release(d3d_device); + return; + } + + device_context = create_device_context(factory, d3d_device); + ok(device_context != NULL, "Failed to create device context.\n"); + + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); +todo_wine + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + if (FAILED(hr)) + { + ID2D1DeviceContext_Release(device_context); + ID2D1Factory1_Release(factory); + return; + } + + ID2D1DeviceContext_SetTarget(device_context, (ID2D1Image *)command_list); + ID2D1DeviceContext_BeginDraw(device_context); + + hr = ID2D1DeviceContext_QueryInterface(device_context, &IID_ID2D1RenderTarget, (void **)&rt); + ok(SUCCEEDED(hr), "Failed to get rt interface, hr %#x.\n", hr); + + /* Test how resources are referenced by the list. */ + + /* Bitmap. */ + set_size_u(&size, 4, 1); + bitmap_desc.pixelFormat.format = DXGI_FORMAT_B8G8R8A8_UNORM; + bitmap_desc.pixelFormat.alphaMode = D2D1_ALPHA_MODE_IGNORE; + bitmap_desc.dpiX = 96.0f; + bitmap_desc.dpiY = 96.0f; + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + ID2D1RenderTarget_DrawBitmap(rt, bitmap, NULL, 0.25f, D2D1_BITMAP_INTERPOLATION_MODE_NEAREST_NEIGHBOR, NULL); + + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Solid color brush. */ + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, brush); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + /* Bitmap brush. */ + hr = ID2D1RenderTarget_CreateBitmap(rt, size, bitmap_data, 4 * sizeof(*bitmap_data), &bitmap_desc, &bitmap); + ok(SUCCEEDED(hr), "Failed to create bitmap, hr %#x.\n", hr); + + hr = ID2D1RenderTarget_CreateBitmapBrush(rt, bitmap, NULL, NULL, (ID2D1BitmapBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create bitmap brush, hr %#x.\n", hr); + + set_rect(&rect, 0.0f, 0.0f, 16.0f, 16.0f); + ID2D1RenderTarget_FillRectangle(rt, &rect, brush); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Bitmap_Release(bitmap); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Linear gradient brush. */ + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), + D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + set_point(&linear_gradient_properties.startPoint, 320.0f, 0.0f); + set_point(&linear_gradient_properties.endPoint, 0.0f, 960.0f); + hr = ID2D1RenderTarget_CreateLinearGradientBrush(rt, &linear_gradient_properties, NULL, gradient, + (ID2D1LinearGradientBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1GradientStopCollection_Release(gradient); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Radial gradient brush. */ + hr = ID2D1RenderTarget_CreateGradientStopCollection(rt, stops, ARRAY_SIZE(stops), + D2D1_GAMMA_2_2, D2D1_EXTEND_MODE_CLAMP, &gradient); + ok(SUCCEEDED(hr), "Failed to create stop collection, hr %#x.\n", hr); + + set_point(&radial_gradient_properties.center, 160.0f, 480.0f); + set_point(&radial_gradient_properties.gradientOriginOffset, 40.0f, -120.0f); + radial_gradient_properties.radiusX = 160.0f; + radial_gradient_properties.radiusY = 480.0f; + hr = ID2D1RenderTarget_CreateRadialGradientBrush(rt, &radial_gradient_properties, NULL, gradient, + (ID2D1RadialGradientBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create brush, hr %#x.\n", hr); + + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1GradientStopCollection_Release(gradient); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Geometry. */ + set_rect(&rect, -1.0f, -1.0f, 1.0f, 1.0f); + hr = ID2D1Factory1_CreateRectangleGeometry(factory, &rect, (ID2D1RectangleGeometry **)&geometry); + ok(SUCCEEDED(hr), "Failed to create geometry, hr %#x.\n", hr); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + ID2D1RenderTarget_FillGeometry(rt, geometry, brush, NULL); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1Geometry_Release(geometry); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Stroke style. */ + stroke_desc.startCap = D2D1_CAP_STYLE_SQUARE; + stroke_desc.endCap = D2D1_CAP_STYLE_ROUND; + stroke_desc.dashCap = D2D1_CAP_STYLE_TRIANGLE; + stroke_desc.lineJoin = D2D1_LINE_JOIN_BEVEL; + stroke_desc.miterLimit = 1.5f; + stroke_desc.dashStyle = D2D1_DASH_STYLE_DOT; + stroke_desc.dashOffset = -1.0f; + + hr = ID2D1Factory_CreateStrokeStyle((ID2D1Factory *)factory, &stroke_desc, NULL, 0, &stroke_style); + ok(SUCCEEDED(hr), "Failed to create stroke style, %#x.\n", hr); + + set_color(&color, 0.0f, 0.0f, 0.0f, 0.0f); + hr = ID2D1RenderTarget_CreateSolidColorBrush(rt, &color, NULL, (ID2D1SolidColorBrush **)&brush); + ok(SUCCEEDED(hr), "Failed to create a brush, hr %#x.\n", hr); + + set_point(&p0, 100.0f, 160.0f); + set_point(&p1, 140.0f, 160.0f); + ID2D1RenderTarget_DrawLine(rt, p0, p1, brush, 1.0f, stroke_style); + + refcount = ID2D1Brush_Release(brush); + ok(refcount == 0, "Got unexpected refcount %u.\n", refcount); + + refcount = ID2D1StrokeStyle_Release(stroke_style); + ok(refcount == 1, "Got unexpected refcount %u.\n", refcount); + + /* Close on attached list. */ + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == (ID2D1Image *)command_list, "Unexpected context target.\n"); + ID2D1Image_Release(target); + + hr = ID2D1CommandList_Close(command_list); + ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr); + + ID2D1DeviceContext_GetTarget(device_context, &target); + ok(target == NULL, "Unexpected context target.\n"); + + hr = ID2D1CommandList_Close(command_list); + ok(hr == D2DERR_WRONG_STATE, "Unexpected hr %#x.\n", hr); + + ID2D1CommandList_Release(command_list); + + /* Close empty list. */ + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + hr = ID2D1CommandList_Close(command_list); + ok(SUCCEEDED(hr), "Failed to close a list, hr %#x.\n", hr); + + ID2D1CommandList_Release(command_list); + + /* List created with different context. */ + device_context2 = create_device_context(factory, d3d_device); + ok(device_context2 != NULL, "Failed to create device context.\n"); + + hr = ID2D1DeviceContext_CreateCommandList(device_context, &command_list); + ok(SUCCEEDED(hr), "Failed to create command list, hr %#x.\n", hr); + + ID2D1DeviceContext_SetTarget(device_context2, (ID2D1Image *)command_list); + ID2D1DeviceContext_GetTarget(device_context2, &target); + ok(target == NULL, "Unexpected target.\n"); + + ID2D1CommandList_Release(command_list); + ID2D1DeviceContext_Release(device_context2); + + ID2D1RenderTarget_Release(rt); + ID2D1DeviceContext_Release(device_context); + refcount = ID2D1Factory1_Release(factory); + ok(!refcount, "Factory has %u references left.\n", refcount); +} + START_TEST(d2d1) { unsigned int argc, i; @@ -7695,6 +7968,7 @@ START_TEST(d2d1) queue_test(test_device_context); queue_test(test_invert_matrix); queue_test(test_skew_matrix); + queue_test(test_command_list); run_queued_tests(); } -- 2.19.1

2 1

[PATCH vkd3d 5/6] vkd3d-shader: Introduce VKD3D_SHADER_VISIBILITY_COMPUTE.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- It should be useful when vkd3d-shader is used outside D3D12. --- include/private/vkd3d_shader.h | 2 ++ libs/vkd3d-shader/spirv.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index d55ed9f89825..bb137baba95b 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -55,6 +55,8 @@ enum vkd3d_shader_visibility VKD3D_SHADER_VISIBILITY_GEOMETRY = 4, VKD3D_SHADER_VISIBILITY_PIXEL = 5, + VKD3D_SHADER_VISIBILITY_COMPUTE = 1000000000, + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_VISIBILITY), }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 79af890a2353..09c6f9f799e4 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2000,6 +2000,8 @@ static bool vkd3d_dxbc_compiler_check_shader_visibility(const struct vkd3d_dxbc_ return compiler->shader_type == VKD3D_SHADER_TYPE_GEOMETRY; case VKD3D_SHADER_VISIBILITY_PIXEL: return compiler->shader_type == VKD3D_SHADER_TYPE_PIXEL; + case VKD3D_SHADER_VISIBILITY_COMPUTE: + return compiler->shader_type == VKD3D_SHADER_TYPE_COMPUTE; default: ERR("Invalid shader visibility %#x.\n", visibility); return false; -- 2.18.1

3 5

[PATCH vkd3d 4/6] vkd3d-shader: Introduce vkd3d_shader_binding_flags.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 13 ++++++++++--- libs/vkd3d-shader/spirv.c | 23 ++++++++++++++++------- libs/vkd3d/state.c | 17 +++++++++-------- 3 files changed, 35 insertions(+), 18 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index b9472a2432e5..d55ed9f89825 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,7 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdbool.h> #include <stdint.h> #ifdef __cplusplus @@ -82,12 +81,20 @@ struct vkd3d_shader_descriptor_binding uint32_t binding; }; +enum vkd3d_shader_binding_flag +{ + VKD3D_SHADER_BINDING_FLAG_BUFFER = 0x00000001, + VKD3D_SHADER_BINDING_FLAG_IMAGE = 0x00000002, + + VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_BINDING_FLAG), +}; + struct vkd3d_shader_resource_binding { enum vkd3d_shader_descriptor_type type; unsigned int register_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; @@ -99,7 +106,7 @@ struct vkd3d_shader_combined_resource_sampler unsigned int resource_index; unsigned int sampler_index; enum vkd3d_shader_visibility shader_visibility; - bool is_buffer; + unsigned int flags; /* vkd3d_shader_binding_flags */ struct vkd3d_shader_descriptor_binding binding; }; diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d281d2524d0a..79af890a2353 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2057,9 +2057,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_interface *shader_interface = &compiler->shader_interface; enum vkd3d_shader_descriptor_type descriptor_type; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_shader_descriptor_binding binding; unsigned int reg_idx = reg->idx[0].offset; - bool is_buffer_resource; unsigned int i; descriptor_type = VKD3D_SHADER_DESCRIPTOR_TYPE_UNKNOWN; @@ -2074,7 +2074,9 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor else FIXME("Unhandled register type %#x.\n", reg->type); - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + if (is_uav_counter) { assert(descriptor_type == VKD3D_SHADER_DESCRIPTOR_TYPE_UAV); @@ -2098,11 +2100,13 @@ static struct vkd3d_shader_descriptor_binding vkd3d_dxbc_compiler_get_descriptor { const struct vkd3d_shader_resource_binding *current = &shader_interface->bindings[i]; + if (!(current->flags & resource_type_flag)) + continue; + if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) continue; - if (current->type == descriptor_type && current->register_index == reg_idx - && current->is_buffer == is_buffer_resource) + if (current->type == descriptor_type && current->register_index == reg_idx) return current->binding; } if (shader_interface->binding_count) @@ -3908,17 +3912,22 @@ static void vkd3d_dxbc_compiler_emit_combined_sampler_declarations(struct vkd3d_ const struct vkd3d_shader_combined_resource_sampler *current; const unsigned int resource_index = resource->idx[0].offset; uint32_t image_type_id, type_id, ptr_type_id, var_id; - bool is_buffer_resource, depth; + enum vkd3d_shader_binding_flag resource_type_flag; struct vkd3d_symbol symbol; unsigned int i; + bool depth; - is_buffer_resource = resource_type == VKD3D_SHADER_RESOURCE_BUFFER; + resource_type_flag = resource_type == VKD3D_SHADER_RESOURCE_BUFFER + ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; for (i = 0; i < shader_interface->combined_sampler_count; ++i) { current = &shader_interface->combined_samplers[i]; - if (current->resource_index != resource_index || current->is_buffer != is_buffer_resource) + if (current->resource_index != resource_index) + continue; + + if (!(current->flags & resource_type_flag)) continue; if (!vkd3d_dxbc_compiler_check_shader_visibility(compiler, current->shader_visibility)) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 7e0b1eeea553..4800ff316308 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -607,14 +607,15 @@ static void d3d12_root_signature_append_vk_binding(struct d3d12_root_signature * bool buffer_descriptor, enum vkd3d_shader_visibility shader_visibility, struct vkd3d_descriptor_set_context *context) { - unsigned int i = context->descriptor_index++; - - root_signature->descriptor_mapping[i].type = descriptor_type; - root_signature->descriptor_mapping[i].register_index = register_idx; - root_signature->descriptor_mapping[i].shader_visibility = shader_visibility; - root_signature->descriptor_mapping[i].is_buffer = buffer_descriptor; - root_signature->descriptor_mapping[i].binding.set = context->set_index; - root_signature->descriptor_mapping[i].binding.binding = context->descriptor_binding++; + struct vkd3d_shader_resource_binding *mapping + = &root_signature->descriptor_mapping[context->descriptor_index++]; + + mapping->type = descriptor_type; + mapping->register_index = register_idx; + mapping->shader_visibility = shader_visibility; + mapping->flags = buffer_descriptor ? VKD3D_SHADER_BINDING_FLAG_BUFFER : VKD3D_SHADER_BINDING_FLAG_IMAGE; + mapping->binding.set = context->set_index; + mapping->binding.binding = context->descriptor_binding++; } static uint32_t d3d12_root_signature_assign_vk_bindings(struct d3d12_root_signature *root_signature, -- 2.18.1

2 1

[PATCH vkd3d 6/6] vkd3d-shader: Avoid uint32_t in public interface.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- include/private/vkd3d_shader.h | 10 ++++------ libs/vkd3d-shader/vkd3d_shader_main.c | 2 +- programs/vkd3d-compiler/main.c | 2 +- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/include/private/vkd3d_shader.h b/include/private/vkd3d_shader.h index bb137baba95b..e97e185158cb 100644 --- a/include/private/vkd3d_shader.h +++ b/include/private/vkd3d_shader.h @@ -19,8 +19,6 @@ #ifndef __VKD3D_SHADER_H #define __VKD3D_SHADER_H -#include <stdint.h> - #ifdef __cplusplus extern "C" { #endif /* __cplusplus */ @@ -79,8 +77,8 @@ enum vkd3d_shader_descriptor_type struct vkd3d_shader_descriptor_binding { - uint32_t set; - uint32_t binding; + unsigned int set; + unsigned int binding; }; enum vkd3d_shader_binding_flag @@ -168,7 +166,7 @@ struct vkd3d_shader_compile_arguments }; int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args); void vkd3d_shader_free_shader_code(struct vkd3d_shader_code *code); @@ -370,7 +368,7 @@ struct vkd3d_shader_scan_info { unsigned int uav_read_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; unsigned int uav_counter_mask : VKD3D_SHADER_MAX_UNORDERED_ACCESS_VIEWS; - uint32_t sampler_comparison_mode_mask; + unsigned int sampler_comparison_mode_mask; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 71410f1d10cb..f81320879e8f 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -75,7 +75,7 @@ static int vkd3d_shader_validate_compile_args(const struct vkd3d_shader_compile_ } int vkd3d_shader_compile_dxbc(const struct vkd3d_shader_code *dxbc, - struct vkd3d_shader_code *spirv, uint32_t compiler_options, + struct vkd3d_shader_code *spirv, unsigned int compiler_options, const struct vkd3d_shader_interface *shader_interface, const struct vkd3d_shader_compile_arguments *compile_args) { diff --git a/programs/vkd3d-compiler/main.c b/programs/vkd3d-compiler/main.c index 5fe4540ca17c..b36343524cd2 100644 --- a/programs/vkd3d-compiler/main.c +++ b/programs/vkd3d-compiler/main.c @@ -107,7 +107,7 @@ struct options { const char *filename; const char *output_filename; - uint32_t compiler_options; + unsigned int compiler_options; }; static bool parse_command_line(int argc, char **argv, struct options *options) -- 2.18.1

3 2

[PATCH vkd3d 1/6] vkd3d: Avoid division by zero in GetResourceAllocationInfo() (Coverity).
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/device.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/device.c b/libs/vkd3d/device.c index 4f5cdd6904aa..e41a309a21a5 100644 --- a/libs/vkd3d/device.c +++ b/libs/vkd3d/device.c @@ -2072,7 +2072,7 @@ static D3D12_RESOURCE_ALLOCATION_INFO * STDMETHODCALLTYPE d3d12_device_GetResour } } - if (desc->Alignment % info->Alignment) + if (valid && desc->Alignment % info->Alignment) { WARN("Invalid resource alignment %#"PRIx64" (required %#"PRIx64").\n", desc->Alignment, info->Alignment); -- 2.18.1

2 1

[PATCH vkd3d 3/6] vkd3d-shader: Use typed shader inputs directly.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> ... instead of copying them to a private floating-point variable. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 13631a07fd1b..d281d2524d0a 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3238,7 +3238,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationComponent, component_idx); } - use_private_var = component_type != VKD3D_TYPE_FLOAT || component_count != VKD3D_VEC4_SIZE; + use_private_var = component_count != VKD3D_VEC4_SIZE || (builtin && builtin->fixup_pfn); vkd3d_symbol_make_register(&reg_symbol, reg); @@ -3256,7 +3256,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_input(struct vkd3d_dxbc_compiler *compi { reg_symbol.id = var_id; reg_symbol.info.reg.storage_class = storage_class; - reg_symbol.info.reg.component_type = VKD3D_TYPE_FLOAT; + reg_symbol.info.reg.component_type = use_private_var ? VKD3D_TYPE_FLOAT : component_type; reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_ALL; vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); -- 2.18.1

2 1

[PATCH v2 vkd3d 2/6] build: Check VK_HEADER_VERSION.
by Józef Kucia 29 Oct '18

29 Oct '18

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- Version 2: Use AC_LINK_IFELSE() instead of AC_RUN_IFELSE(). --- configure.ac | 2 ++ m4/vulkan.m4 | 18 ++++++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 m4/vulkan.m4 diff --git a/configure.ac b/configure.ac index 58672c510ab9..8c82741a9bae 100644 --- a/configure.ac +++ b/configure.ac @@ -61,6 +61,8 @@ AS_IF([test "x$ac_cv_header_spirv_unified1_GLSL_std_450_h" != "xyes" \ -a "x$ac_cv_header_vulkan_GLSL_std_450_h" != "xyes"], [AC_MSG_ERROR([GLSL.std.450.h not found.])]) +VKD3D_CHECK_VULKAN_HEADER_VERSION([84], [AC_MSG_ERROR([Vulkan headers are too old, 1.1.84 is required.])]) + dnl Check for libraries m4_ifdef([PKG_PROG_PKG_CONFIG], [PKG_PROG_PKG_CONFIG], [m4_fatal([pkg-config autoconf macros not found.])]) diff --git a/m4/vulkan.m4 b/m4/vulkan.m4 new file mode 100644 index 000000000000..6ef5818c8fd6 --- /dev/null +++ b/m4/vulkan.m4 @@ -0,0 +1,18 @@ +dnl VKD3D_CHECK_VULKAN_HEADER_VERSION +AC_DEFUN([VKD3D_CHECK_VULKAN_HEADER_VERSION], + +[AS_VAR_PUSHDEF([vkd3d_vk_version], vkd3d_cv_vk_header_version_[[$1]]) + +AC_CACHE_CHECK([whether VK_HEADER_VERSION >= [$1]], vkd3d_vk_version, + [AC_LINK_IFELSE( + [AC_LANG_SOURCE([#include <vulkan/vulkan.h> + #if VK_HEADER_VERSION < $1 + #error "Vulkan headers are too old" + #endif + int main(void) { return 0; }])], + [AS_VAR_SET([vkd3d_vk_version], [yes])], + [AS_VAR_SET([vkd3d_vk_version], [no])])]) + +AS_IF([test "x$vkd3d_vk_version" != "xyes"], [$2]) + +AS_VAR_POPDEF([vkd3d_vk_version])]) -- 2.18.1

3 2

[PATCH 3/3] server: Use a separated object for each opened named pipe device file.
by Jacek Caban 29 Oct '18

29 Oct '18

Allows using proper options for ioctl pseudo fd. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- server/named_pipe.c | 118 +++++++++++++++++++++++++++++----------- 2 files changed, 87 insertions(+), 33 deletions(-)

1 0

[PATCH 2/3] server: Use requested options for device pseudo fd.
by Jacek Caban 29 Oct '18

29 Oct '18

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/tests/file.c | 2 +- server/device.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[PATCH 1/3] server: Add FileModeInformation implementation.
by Jacek Caban 29 Oct '18

29 Oct '18

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45749 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntdll/file.c | 2 +- dlls/ntdll/tests/file.c | 96 ++++++++++++++++++++++++++++++++++++++++- server/fd.c | 16 +++++++ 3 files changed, 112 insertions(+), 2 deletions(-)

1 0