wine-commits January 2019

wine-commits@winehq.org

2 participants
499 discussions

Józef Kucia : vkd3d-shader: Use result type for atomic instructions source parameters.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: ff7df2cdf9fd6d9e83113e22113c03d37f37729a URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ff7df2cdf9fd6d9e83113e2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:44 2019 +0100 vkd3d-shader: Use result type for atomic instructions source parameters. Fixes SPIR-V validation errors: AtomicIAdd: expected Value to be of type Result Type Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index fa94340..40cb2e3 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2799,6 +2799,15 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_src(struct vkd3d_dxbc_compiler *co return vkd3d_dxbc_compiler_emit_src_modifier(compiler, &src->reg, write_mask, src->modifiers, val_id); } +static uint32_t vkd3d_dxbc_compiler_emit_load_src_with_type(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_src_param *src, DWORD write_mask, enum vkd3d_component_type component_type) +{ + struct vkd3d_shader_src_param src_param = *src; + + src_param.reg.data_type = vkd3d_data_type_from_component_type(component_type); + return vkd3d_dxbc_compiler_emit_load_src(compiler, &src_param, write_mask); +} + static void vkd3d_dxbc_compiler_emit_store_scalar(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_register *reg, DWORD write_mask, const struct vkd3d_shader_register_info *reg_info, uint32_t val_id) @@ -6244,7 +6253,6 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; - struct vkd3d_shader_src_param texel_param = src[1]; uint32_t coordinate_id, texel_id; struct vkd3d_shader_image image; DWORD coordinate_mask; @@ -6254,9 +6262,7 @@ static void vkd3d_dxbc_compiler_emit_store_uav_typed(struct vkd3d_dxbc_compiler vkd3d_dxbc_compiler_prepare_image(compiler, &image, &dst->reg, NULL, VKD3D_IMAGE_FLAG_NONE); coordinate_mask = (1u << image.resource_type_info->coordinate_component_count) - 1; coordinate_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[0], coordinate_mask); - /* XXX: Fix the data type. */ - texel_param.reg.data_type = vkd3d_data_type_from_component_type(image.sampled_type); - texel_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &texel_param, dst->write_mask); + texel_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], dst->write_mask, image.sampled_type); vkd3d_spirv_build_op_image_write(builder, image.image_id, coordinate_id, texel_id, SpvImageOperandsMaskNone, NULL, 0); @@ -6365,6 +6371,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil const struct vkd3d_shader_dst_param *resource; uint32_t coordinate_id, sample_id, pointer_id; struct vkd3d_shader_register_info reg_info; + enum vkd3d_component_type component_type; struct vkd3d_shader_image image; unsigned int structure_stride; DWORD coordinate_mask; @@ -6417,12 +6424,14 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (resource->reg.type == VKD3DSPR_GROUPSHAREDMEM) { + component_type = VKD3D_TYPE_UINT; ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, reg_info.storage_class, type_id); pointer_id = vkd3d_spirv_build_op_access_chain(builder, ptr_type_id, reg_info.id, &coordinate_id, 1); } else { + component_type = image.sampled_type; type_id = vkd3d_spirv_get_type_id(builder, image.sampled_type, 1); ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassImage, type_id); sample_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, 0); @@ -6430,7 +6439,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil ptr_type_id, image.id, coordinate_id, sample_id); } - val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[1], VKD3DSP_WRITEMASK_0); + val_id = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[1], VKD3DSP_WRITEMASK_0, component_type); operands[i++] = pointer_id; operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, scope); @@ -6438,7 +6447,7 @@ static void vkd3d_dxbc_compiler_emit_atomic_instruction(struct vkd3d_dxbc_compil if (instruction->src_count >= 3) { operands[i++] = vkd3d_dxbc_compiler_get_constant_uint(compiler, SpvMemorySemanticsMaskNone); - operands[i++] = vkd3d_dxbc_compiler_emit_load_src(compiler, &src[2], VKD3DSP_WRITEMASK_0); + operands[i++] = vkd3d_dxbc_compiler_emit_load_src_with_type(compiler, &src[2], VKD3DSP_WRITEMASK_0, component_type); } operands[i++] = val_id; result_id = vkd3d_spirv_build_op_trv(builder, &builder->function_stream,

1 0

Józef Kucia : tests: Add test for SV_VertexID with indirect draws.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: 9f0c4288743dc9fbcc1cdd9752a22f1b146a86ff URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=9f0c4288743dc9fbcc1cdd9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:43 2019 +0100 tests: Add test for SV_VertexID with indirect draws. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 163 +++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 111 insertions(+), 52 deletions(-) Diff: https://source.winehq.org/git/vkd3d.git/?a=commitdiff;h=9f0c4288743dc9fbcc1…

1 0

Józef Kucia : tests: Add test for SV_VertexID.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: 5fcefdd39e4aa56fecdf5b1d3a9ada7f2da6fcd1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=5fcefdd39e4aa56fecdf5b1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:42 2019 +0100 tests: Add test for SV_VertexID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tests/d3d12.c | 226 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index a2a40d6..32220a9 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -19295,6 +19295,231 @@ static void test_instance_id(void) destroy_test_context(&context); } +static void test_vertex_id(void) +{ + static const DWORD vs_code[] = + { +#if 0 + uint4 main(uint id : ID, uint instance_id : SV_InstanceID, uint vertex_id : SV_VertexID) : OUTPUT + { + return uint4(id, instance_id, vertex_id, 0); + } +#endif + 0x43425844, 0x5625197b, 0x588ccf8f, 0x48694905, 0x961d19ca, 0x00000001, 0x00000170, 0x00000003, + 0x0000002c, 0x000000a4, 0x000000d4, 0x4e475349, 0x00000070, 0x00000003, 0x00000008, 0x00000050, + 0x00000000, 0x00000000, 0x00000001, 0x00000000, 0x00000101, 0x00000053, 0x00000000, 0x00000008, + 0x00000001, 0x00000001, 0x00000101, 0x00000061, 0x00000000, 0x00000006, 0x00000001, 0x00000002, + 0x00000101, 0x53004449, 0x6e495f56, 0x6e617473, 0x44496563, 0x5f565300, 0x74726556, 0x44497865, + 0xababab00, 0x4e47534f, 0x00000028, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000000, + 0x00000001, 0x00000000, 0x0000000f, 0x5054554f, 0xab005455, 0x52444853, 0x00000094, 0x00010040, + 0x00000025, 0x0300005f, 0x00101012, 0x00000000, 0x04000060, 0x00101012, 0x00000001, 0x00000008, + 0x04000060, 0x00101012, 0x00000002, 0x00000006, 0x03000065, 0x001020f2, 0x00000000, 0x05000036, + 0x00102012, 0x00000000, 0x0010100a, 0x00000000, 0x05000036, 0x00102022, 0x00000000, 0x0010100a, + 0x00000001, 0x05000036, 0x00102042, 0x00000000, 0x0010100a, 0x00000002, 0x05000036, 0x00102082, + 0x00000000, 0x00004001, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE vs = {vs_code, sizeof(vs_code)}; + D3D12_INPUT_ELEMENT_DESC layout_desc[] = + { + {"ID", 0, DXGI_FORMAT_R32_UINT, 0, D3D12_APPEND_ALIGNED_ELEMENT, D3D12_INPUT_CLASSIFICATION_PER_VERTEX_DATA, 0}, + }; + static const D3D12_SO_DECLARATION_ENTRY so_declaration[] = + { + {0, "OUTPUT", 0, 0, 4, 0}, + }; + static const unsigned int strides[] = {16}; + static const unsigned int vertices[] = + { + 0, + 1, + 2, + + 3, + 4, + 5, + + 6, + 7, + 8, + + 5, + 6, + 7, + }; + static const unsigned int indices[] = + { + 6, 7, 8, + + 0, 1, 2, + }; + struct uvec4 expected_values[] = + { + {0, 0, 0}, + {1, 0, 1}, + {2, 0, 2}, + {0, 1, 0}, + {1, 1, 1}, + {2, 1, 2}, + + {3, 0, 0}, + {4, 0, 1}, + {5, 0, 2}, + + {6, 0, 6}, + {7, 0, 7}, + {8, 0, 8}, + {6, 1, 6}, + {7, 1, 7}, + {8, 1, 8}, + + {5, 0, 0}, + {6, 0, 1}, + {7, 0, 2}, + }; + + BOOL found_values[ARRAY_SIZE(expected_values)] = {0}; + BOOL used_values[ARRAY_SIZE(expected_values)] = {0}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12Resource *counter_buffer, *so_buffer; + ID3D12GraphicsCommandList *command_list; + D3D12_INPUT_LAYOUT_DESC input_layout; + D3D12_STREAM_OUTPUT_BUFFER_VIEW sobv; + ID3D12Resource *upload_buffer; + struct test_context_desc desc; + D3D12_VERTEX_BUFFER_VIEW vbv; + D3D12_INDEX_BUFFER_VIEW ibv; + struct resource_readback rb; + struct test_context context; + ID3D12CommandQueue *queue; + ID3D12Resource *vb, *ib; + ID3D12Device *device; + unsigned int count; + unsigned int i, j; + HRESULT hr; + + memset(&desc, 0, sizeof(desc)); + desc.root_signature_flags = D3D12_ROOT_SIGNATURE_FLAG_ALLOW_INPUT_ASSEMBLER_INPUT_LAYOUT + | D3D12_ROOT_SIGNATURE_FLAG_ALLOW_STREAM_OUTPUT; + desc.no_pipeline = true; + if (!init_test_context(&context, &desc)) + return; + device = context.device; + command_list = context.list; + queue = context.queue; + + input_layout.pInputElementDescs = layout_desc; + input_layout.NumElements = ARRAY_SIZE(layout_desc); + + init_pipeline_state_desc(&pso_desc, context.root_signature, 0, &vs, NULL, &input_layout); + memset(&pso_desc.PS, 0, sizeof(pso_desc.PS)); + pso_desc.StreamOutput.NumEntries = ARRAY_SIZE(so_declaration); + pso_desc.StreamOutput.pSODeclaration = so_declaration; + pso_desc.StreamOutput.pBufferStrides = strides; + pso_desc.StreamOutput.NumStrides = ARRAY_SIZE(strides); + pso_desc.StreamOutput.RasterizedStream = D3D12_SO_NO_RASTERIZED_STREAM; + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; + hr = ID3D12Device_CreateGraphicsPipelineState(device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + if (hr == E_NOTIMPL) + { + skip("Stream output is not supported.\n"); + destroy_test_context(&context); + return; + } + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + vb = create_upload_buffer(context.device, sizeof(vertices), vertices); + vbv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(vb); + vbv.StrideInBytes = sizeof(*vertices); + vbv.SizeInBytes = sizeof(vertices); + + ib = create_upload_buffer(context.device, sizeof(indices), indices); + ibv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(ib); + ibv.SizeInBytes = sizeof(indices); + ibv.Format = DXGI_FORMAT_R32_UINT; + + count = 0; + upload_buffer = create_upload_buffer(device, sizeof(count), &count); + + counter_buffer = create_default_buffer(device, 32, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_COPY_DEST); + so_buffer = create_default_buffer(device, 1024, + D3D12_RESOURCE_FLAG_NONE, D3D12_RESOURCE_STATE_STREAM_OUT); + sobv.BufferLocation = ID3D12Resource_GetGPUVirtualAddress(so_buffer); + sobv.SizeInBytes = 1024; + sobv.BufferFilledSizeLocation = ID3D12Resource_GetGPUVirtualAddress(counter_buffer); + + ID3D12GraphicsCommandList_CopyBufferRegion(command_list, counter_buffer, 0, + upload_buffer, 0, sizeof(count)); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_COPY_DEST, D3D12_RESOURCE_STATE_STREAM_OUT); + + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); + ID3D12GraphicsCommandList_IASetIndexBuffer(command_list, &ibv); + ID3D12GraphicsCommandList_IASetVertexBuffers(command_list, 0, 1, &vbv); + + ID3D12GraphicsCommandList_SOSetTargets(command_list, 0, 1, &sobv); + + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 2, 0, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 3, 16); + + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 2, 0, 0, 0); + ID3D12GraphicsCommandList_DrawIndexedInstanced(command_list, 3, 1, 3, 9, 7); + + transition_resource_state(command_list, counter_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + transition_resource_state(command_list, so_buffer, + D3D12_RESOURCE_STATE_STREAM_OUT, D3D12_RESOURCE_STATE_COPY_SOURCE); + + get_buffer_readback_with_command_list(counter_buffer, DXGI_FORMAT_R32_UINT, &rb, queue, command_list); + count = get_readback_uint(&rb, 0, 0, 0); + ok(count == ARRAY_SIZE(expected_values) * sizeof(struct vec4), "Got counter value %u, expected %uu.\n", + count, (unsigned int)(ARRAY_SIZE(expected_values) * sizeof(struct vec4))); + release_resource_readback(&rb); + reset_command_list(command_list, context.allocator); + count /= sizeof(struct vec4); + + count = min(count, ARRAY_SIZE(used_values)); + get_buffer_readback_with_command_list(so_buffer, DXGI_FORMAT_UNKNOWN, &rb, queue, command_list); + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + for (j = 0; j < count; ++j) + { + if (!used_values[j] && compare_uvec4(get_readback_uvec4(&rb, j, 0), &expected_values[i])) + { + found_values[i] = TRUE; + used_values[j] = TRUE; + break; + } + } + } + + for (i = 0; i < count; ++i) + { + const struct uvec4 *v = get_readback_uvec4(&rb, i, 0); + ok(used_values[i], "Found unexpected value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", v->x, v->y, v->z, v->w); + } + release_resource_readback(&rb); + + for (i = 0; i < ARRAY_SIZE(expected_values); ++i) + { + ok(found_values[i], "Failed to find value {0x%08x, 0x%08x, 0x%08x, 0x%08x}.\n", + expected_values[i].x, expected_values[i].y, expected_values[i].z, expected_values[i].w); + } + + ID3D12Resource_Release(counter_buffer); + ID3D12Resource_Release(ib); + ID3D12Resource_Release(so_buffer); + ID3D12Resource_Release(upload_buffer); + ID3D12Resource_Release(vb); + destroy_test_context(&context); +} + static void test_copy_texture_region(void) { D3D12_TEXTURE_COPY_LOCATION src_location, dst_location; @@ -22661,6 +22886,7 @@ START_TEST(d3d12) run_test(test_execute_indirect); run_test(test_dispatch_zero_thread_groups); run_test(test_instance_id); + run_test(test_vertex_id); run_test(test_copy_texture_region); run_test(test_separate_bindings); run_test(test_face_culling);

1 0

Józef Kucia : vkd3d-shader: Fix SV_VertexID.
by Alexandre Julliard 15 Jan '19

15 Jan '19

Module: vkd3d Branch: master Commit: da3e28371780ff731e6fb6cfa259e1bed91dd2b1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=da3e28371780ff731e6fb6c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Jan 15 12:09:41 2019 +0100 vkd3d-shader: Fix SV_VertexID. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- libs/vkd3d-shader/spirv.c | 43 ++++++++++++++++++++++++++----------------- 1 file changed, 26 insertions(+), 17 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 9d1a0df..fa94340 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3003,31 +3003,40 @@ static uint32_t vkd3d_dxbc_compiler_emit_bool_to_int(struct vkd3d_dxbc_compiler typedef uint32_t (*vkd3d_spirv_builtin_fixup_pfn)(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id); -/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ -static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, - uint32_t instance_index_id) +static uint32_t vkd3d_dxbc_compiler_emit_draw_parameter_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t index_id, SpvBuiltIn base) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t base_instance_var_id, base_instance_id, type_id; + uint32_t base_var_id, base_id, type_id; vkd3d_spirv_enable_capability(builder, SpvCapabilityDrawParameters); - /* The Vulkan spec states: - * - * "The variable decorated with BaseInstance must be declared as a scalar - * 32-bit integer. - */ - base_instance_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, + base_var_id = vkd3d_dxbc_compiler_emit_variable(compiler, &builder->global_stream, SpvStorageClassInput, VKD3D_TYPE_INT, 1); - vkd3d_spirv_add_iface_variable(builder, base_instance_var_id); - vkd3d_dxbc_compiler_decorate_builtin(compiler, base_instance_var_id, SpvBuiltInBaseInstance); + vkd3d_spirv_add_iface_variable(builder, base_var_id); + vkd3d_dxbc_compiler_decorate_builtin(compiler, base_var_id, base); type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_INT, 1); - base_instance_id = vkd3d_spirv_build_op_load(builder, - type_id, base_instance_var_id, SpvMemoryAccessMaskNone); + base_id = vkd3d_spirv_build_op_load(builder, + type_id, base_var_id, SpvMemoryAccessMaskNone); - return vkd3d_spirv_build_op_isub(builder, - type_id, instance_index_id, base_instance_id); + return vkd3d_spirv_build_op_isub(builder, type_id, index_id, base_id); +} + +/* Substitute "VertexIndex - BaseVertex" for SV_VertexID. */ +static uint32_t sv_vertex_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t vertex_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + vertex_index_id, SpvBuiltInBaseVertex); +} + +/* Substitute "InstanceIndex - BaseInstance" for SV_InstanceID. */ +static uint32_t sv_instance_id_fixup(struct vkd3d_dxbc_compiler *compiler, + uint32_t instance_index_id) +{ + return vkd3d_dxbc_compiler_emit_draw_parameter_fixup(compiler, + instance_index_id, SpvBuiltInBaseInstance); } static uint32_t sv_front_face_fixup(struct vkd3d_dxbc_compiler *compiler, @@ -3061,7 +3070,7 @@ vkd3d_system_value_builtins[] = {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceId}, VKD3D_SHADER_TARGET_SPIRV_OPENGL_4_5}, {VKD3D_SIV_POSITION, {VKD3D_TYPE_FLOAT, 4, SpvBuiltInPosition}}, - {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex}}, + {VKD3D_SIV_VERTEX_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInVertexIndex, sv_vertex_id_fixup}}, {VKD3D_SIV_INSTANCE_ID, {VKD3D_TYPE_INT, 1, SpvBuiltInInstanceIndex, sv_instance_id_fixup}}, {VKD3D_SIV_RENDER_TARGET_ARRAY_INDEX, {VKD3D_TYPE_INT, 1, SpvBuiltInLayer}},

1 0

Jeremy White : Revise the 'Get Involved' web page.
by Jeremy Newman 15 Jan '19

15 Jan '19

Module: website Branch: master Commit: 4e7a77a19e8541f85bf4ce2d0b9fa2d2a2b4ecc7 URL: https://source.winehq.org/git/website.git/?a=commit;h=4e7a77a19e8541f85bf4c… Author: Jeremy White <jwhite(a)codeweavers.com> Date: Tue Jan 15 09:34:09 2019 -0600 Revise the 'Get Involved' web page. This attempts to remove some information that is provided at other points in the web site, and to adjust the language to attempt to improve the overall flow of the page. Signed-off-by: Jeremy White <jwhite(a)codeweavers.com> Signed-off-by: Jeremy Newman <jnewman(a)codeweavers.com> --- templates/en/getinvolved.template | 92 +++++++++++---------------------------- templates/en/home.template | 2 +- 2 files changed, 26 insertions(+), 68 deletions(-) diff --git a/templates/en/getinvolved.template b/templates/en/getinvolved.template index 8ad5b04..23028db 100644 --- a/templates/en/getinvolved.template +++ b/templates/en/getinvolved.template @@ -1,14 +1,14 @@ - + -<h1 class="title">Development Links</h1> +<h1 class="title">Get Involved</h1> -<p>Welcome to Wine development. On this page you will find links to our -various resources available for our developers.</p> +<p>The Wine Project is largely a volunteer project and we welcome +and value volunteers of all kinds. This page has links to pages describing how to get more involved with Wine.</p> <div class="black inverse bold cornerround padding-sm"> <div class="row"> - <div class="col-xs-3 col-md-2">Option</div> - <div class="col-xs-9 col-md-10">About this Option</div> + <div class="col-xs-3 col-md-2">Link</div> + <div class="col-xs-9 col-md-10">Description</div> </div> </div> @@ -17,108 +17,66 @@ various resources available for our developers.</p> <a href="https://wiki.winehq.org/Main_Page#Contribute">Contributing to Wine</a> </div> <div class="col-xs-9 col-md-10"> - Information for 1st time contributors. + A list of ways to contribute to Wine, with further links. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer Documentation</a> + <a href="https://wiki.winehq.org/Developers">Developer Documentation</a> </div> <div class="col-xs-9 col-md-10"> - The <a href="https://wiki.winehq.org/Developers">Wine Wiki Developer</a> pages will have more current - information than this page. It should be the first place for new developers to look. + The developer pages provide a great deal of information about how + to work with the Wine source code and how to contribute code to Wine. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://www.codeweavers.com/about/jobs">Internships</a> + <a href="{$root}/forums">Forums and Mailing Lists</a> </div> <div class="col-xs-9 col-md-10"> - CodeWeavers fills 1-2 Wine Development Internship slots every quarter for students and recent graduates. - Applications are accepted on an ongoing basis, and candidates from both the United States and overseas - are welcome. + Most user support happens on our forums, and most technical + Wine discussion takes place on the wine-devel mailing list. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Developer's_Guide">Developer's Guide</a> + <a href="{$root}/irc">IRC</a> </div> <div class="col-xs-9 col-md-10"> - Online resource for development with Wine. + Our IRC chat rooms can be a good place for more informal conversations. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="{$root}/forums">Mailing Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - Most of our developers communicate over our various mailing lists. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Git_Wine_Tutorial">Git</a> - </div> - <div class="col-xs-9 col-md-10"> - We use the source management tool Git. More information on how to use it can be found on this page. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Submitting_Patches">Sending Patches</a> - </div> - <div class="col-xs-9 col-md-10"> - Guidelines on how to format and send your patches. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Category:ToDo">To Do Lists</a> - </div> - <div class="col-xs-9 col-md-10"> - What needs to be done. A good first place to look for projects to be completed. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Winelib">Winelib</a> - </div> - <div class="col-xs-9 col-md-10"> - Documentation on development with Winelib, our application porting tools. - </div> -</div> - -<div class="row padding-md"> - <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Wine_Status">Status</a> + <a href="https://wiki.winehq.org/WineConf">WineConf</a> </div> <div class="col-xs-9 col-md-10"> - Status of the Wine project.<br> + We hold a conference annually. Everyone is welcome, and coming to + our conference is a great way to get involved. </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/Licensing">Wine License</a> + <a href="https://wiki.winehq.org/Summer_Of_Code">Summer of Code</a> </div> <div class="col-xs-9 col-md-10"> - Wine uses the GNU Lesser General Public License 2.1 + Wine is a regular participant in the Google Summer of Code program. + Students can be paid to help improve Wine! </div> </div> <div class="row padding-md"> <div class="col-xs-3 col-md-2"> - <a href="https://wiki.winehq.org/WineConf">WineConf</a> + <a href="https://www.codeweavers.com/about/jobs">Jobs at CodeWeavers</a> </div> <div class="col-xs-9 col-md-10"> - We hold a conference annually. Information on where and when can be found here. + CodeWeavers employs a range of staff to develop Wine. If you think + working on Free Software full time would be rewarding, you might consider + applying for a job with CodeWeavers. </div> </div> diff --git a/templates/en/home.template b/templates/en/home.template index 0411569..cc8d5de 100644 --- a/templates/en/home.template +++ b/templates/en/home.template @@ -137,7 +137,7 @@ <i class="fa-inverse fas fa-users" data-fa-transform="shrink-6"></i> </span> <span class="title">Get Involved</span> - <span class="subtitle">Become a Wine advocate.</span> + <span class="subtitle">Improve and develop Wine.</span> </a> <div class="clear"></div>

1 0

Gijs Vermeulen : crypt32/tests: Fix a typo in ok() message.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 8e0139af2a1cd1ac12aadfa18c8bb04552433ce4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8e0139af2a1cd1ac12aadfa1… Author: Gijs Vermeulen <gijsvrm(a)gmail.com> Date: Mon Jan 14 17:46:49 2019 +0100 crypt32/tests: Fix a typo in ok() message. Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/crypt32/tests/store.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/crypt32/tests/store.c b/dlls/crypt32/tests/store.c index 9915482..0adfeb8 100644 --- a/dlls/crypt32/tests/store.c +++ b/dlls/crypt32/tests/store.c @@ -541,7 +541,7 @@ static void testStoresInCollection(void) cert2 = CertCreateCertificateContext(X509_ASN_ENCODING, signedBigCert, sizeof(signedBigCert)); ok (cert2 != NULL, "Failed to create cert context %x\n", GetLastError()); ret = CertAddCertificateContextToStore(collection, cert2, CERT_STORE_ADD_REPLACE_EXISTING, NULL); - ok (ret, "Failed to add cert3 to the store %x\n",GetLastError()); + ok (ret, "Failed to add cert2 to the store %x\n",GetLastError()); /** checking certificates in the stores */ tcert1 = CertEnumCertificatesInStore(ro_store, 0);

1 0

Huw Davies : gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 870db3b25a1c73044d583bd37f64392ea66abc5d URL: https://source.winehq.org/git/wine.git/?a=commit;h=870db3b25a1c73044d583bd3… Author: Huw Davies <huw(a)codeweavers.com> Date: Mon Jan 14 15:02:26 2019 +0000 gdi32/tests: Korean and Chinese machines may use MS Shell Dlg as their default GUI font. This is an extension of commit c81ff0f8cfc1a7b6fa7546d8ffb656e290ef5e7e. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=35573 Signed-off-by: Huw Davies <huw(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdi32/tests/font.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/dlls/gdi32/tests/font.c b/dlls/gdi32/tests/font.c index 7569694..67e8941 100644 --- a/dlls/gdi32/tests/font.c +++ b/dlls/gdi32/tests/font.c @@ -6340,7 +6340,7 @@ static void test_stock_fonts(void) int charset, weight, height, height_pixels, dpi; const char face_name[LF_FACESIZE]; WORD lang_id; - } td[][12] = + } td[][17] = { { /* ANSI_FIXED_FONT */ { ANSI_CHARSET, FW_NORMAL, 12, 12, 96, "Courier", LANG_ARABIC }, @@ -6374,10 +6374,15 @@ static void test_stock_fonts(void) }, { /* DEFAULT_GUI_FONT */ { SHIFTJIS_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { SHIFTJIS_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { SHIFTJIS_CHARSET, FW_NORMAL, -12, 15, 96, "?MS UI Gothic" }, { SHIFTJIS_CHARSET, FW_NORMAL, -15, 18, 120, "?MS UI Gothic" }, + { HANGEUL_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { HANGEUL_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { HANGEUL_CHARSET, FW_NORMAL, -12, 15, 96, "?Gulim" }, { HANGEUL_CHARSET, FW_NORMAL, -15, 18, 120, "?Gulim" }, + { GB2312_CHARSET, FW_NORMAL, -11, 13, 96, "MS Shell Dlg" }, + { GB2312_CHARSET, FW_NORMAL, -13, 16, 120, "MS Shell Dlg" }, { GB2312_CHARSET, FW_NORMAL, -12, 15, 96, "?SimHei" }, { GB2312_CHARSET, FW_NORMAL, -15, 18, 120, "?SimHei" }, { CHINESEBIG5_CHARSET, FW_NORMAL, -12, 15, 96, "?MingLiU" },

1 0

Józef Kucia : wined3d: Execute all CS commands before setting palette entries.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: 77f40d05817236966390def672e6ebbd4b45bf53 URL: https://source.winehq.org/git/wine.git/?a=commit;h=77f40d05817236966390def6… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 12 12:23:18 2019 +0100 wined3d: Execute all CS commands before setting palette entries. This is not the most performant solution. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44796 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/palette.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/wined3d/palette.c b/dlls/wined3d/palette.c index 2436100..d78a364 100644 --- a/dlls/wined3d/palette.c +++ b/dlls/wined3d/palette.c @@ -98,6 +98,8 @@ HRESULT CDECL wined3d_palette_set_entries(struct wined3d_palette *palette, palette, flags, start, count, entries); TRACE("Palette flags: %#x.\n", palette->flags); + wined3d_cs_finish(palette->device->cs, WINED3D_CS_QUEUE_DEFAULT); + if (palette->flags & WINED3D_PALETTE_8BIT_ENTRIES) { const BYTE *entry = (const BYTE *)entries;

1 0

Józef Kucia : wined3d: Execute all CS commands before changing swapchain palette.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: cd2dee0f4bb7a852bfe834ab676467be785b6eba URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd2dee0f4bb7a852bfe834ab… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sat Jan 12 12:23:17 2019 +0100 wined3d: Execute all CS commands before changing swapchain palette. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=44796 Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/swapchain.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 3a7039d..f7fc05f 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -299,6 +299,9 @@ HRESULT CDECL wined3d_swapchain_set_gamma_ramp(const struct wined3d_swapchain *s void CDECL wined3d_swapchain_set_palette(struct wined3d_swapchain *swapchain, struct wined3d_palette *palette) { TRACE("swapchain %p, palette %p.\n", swapchain, palette); + + wined3d_cs_finish(swapchain->device->cs, WINED3D_CS_QUEUE_DEFAULT); + swapchain->palette = palette; }

1 0

James Larrowe : winebuild: Fix a segmentation fault.
by Alexandre Julliard 14 Jan '19

14 Jan '19

Module: wine Branch: master Commit: f97636bc494bef29073ed441e27ca8bd1f89c178 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f97636bc494bef29073ed441… Author: James Larrowe <larrowe.semaj11(a)gmail.com> Date: Sat Jan 12 17:01:08 2019 -0500 winebuild: Fix a segmentation fault. When 'winebuild' is called with no arguments, the make_c_identifier function is passed a null pointer, which is dereferenced and causes a segmentation fault. Signed-off-by: James Larrowe <larrowe.semaj11(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winebuild/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/winebuild/main.c b/tools/winebuild/main.c index 70f381c..b2f5c95 100644 --- a/tools/winebuild/main.c +++ b/tools/winebuild/main.c @@ -164,7 +164,7 @@ static void init_dll_name( DLLSPEC *spec ) spec->dll_name = xstrdup( spec->file_name ); if ((p = strrchr( spec->dll_name, '.' ))) *p = 0; } - spec->c_name = make_c_identifier( spec->dll_name ); + if (spec->dll_name) spec->c_name = make_c_identifier( spec->dll_name ); } /* set the dll subsystem */

1 0

← Newer
1
...
34
35
36
37
38
39
40
...
50
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2019