wine-commits February 2019

wine-commits@winehq.org

1 participants
672 discussions

Paul Gofman : d3d9/tests: Test GetStreamSourceFreq() before any values were set.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 4ac31569f93c6e8c77ba652915755275d8946538 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4ac31569f93c6e8c77ba6529… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 8 19:34:14 2019 +0300 d3d9/tests: Test GetStreamSourceFreq() before any values were set. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/visual.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/dlls/d3d9/tests/visual.c b/dlls/d3d9/tests/visual.c index 3a6608a..13cf6c7 100644 --- a/dlls/d3d9/tests/visual.c +++ b/dlls/d3d9/tests/visual.c @@ -12419,9 +12419,15 @@ static void stream_test(void) goto done; } - /* set the default value because it isn't done in wine? */ + hr = IDirect3DDevice9_GetStreamSourceFreq(device, 0, &ind); + ok(hr == D3D_OK && ind == 1, "IDirect3DDevice9_GetStreamSourceFreq unexpected result, " + "hr %#x, ind %#x.\n", hr, ind); + hr = IDirect3DDevice9_GetStreamSourceFreq(device, 1, &ind); + ok(hr == D3D_OK && ind == 1, "IDirect3DDevice9_GetStreamSourceFreq unexpected result, " + "hr %#x, ind %#x.\n", hr, ind); + hr = IDirect3DDevice9_SetStreamSourceFreq(device, 1, 1); - ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed with %08x\n", hr); + ok(hr == D3D_OK, "IDirect3DDevice9_SetStreamSourceFreq failed, hr %#x.\n", hr); /* check for D3DSTREAMSOURCE_INDEXEDDATA at stream0 */ hr = IDirect3DDevice9_SetStreamSourceFreq(device, 0, (D3DSTREAMSOURCE_INSTANCEDATA | 1));

1 0

Paul Gofman : wined3d: Initialise stream frequency to 1.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: wine Branch: master Commit: 53b6e77a5d9fa7c7b331c49d4cd36aee34339d39 URL: https://source.winehq.org/git/wine.git/?a=commit;h=53b6e77a5d9fa7c7b331c49d… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri Feb 8 19:34:13 2019 +0300 wined3d: Initialise stream frequency to 1. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=39080 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- dlls/wined3d/stateblock.c | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 81b1fc0..96ba06d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5388,7 +5388,7 @@ static void context_load_numbered_arrays(struct wined3d_context *context, stream = &state->streams[element->stream_idx]; if ((stream->flags & WINED3DSTREAMSOURCE_INSTANCEDATA) && !context->instance_count) - context->instance_count = state->streams[0].frequency ? state->streams[0].frequency : 1; + context->instance_count = state->streams[0].frequency; if (gl_info->supported[ARB_INSTANCED_ARRAYS]) { diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 4f16c99..1ae0f35 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -1448,6 +1448,9 @@ static void state_init_default(struct wined3d_state *state, const struct wined3d state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void state_init(struct wined3d_state *state, struct wined3d_fb_state *fb, @@ -1496,6 +1499,9 @@ static void stateblock_state_init_default(struct wined3d_stateblock_state *state state->blend_factor.g = 1.0f; state->blend_factor.b = 1.0f; state->blend_factor.a = 1.0f; + + for (i = 0; i < MAX_STREAMS; ++i) + state->streams[i].frequency = 1; } void wined3d_stateblock_state_init(struct wined3d_stateblock_state *state,

1 0

Józef Kucia : vkd3d: Fix formatting in is_dual_source_blending().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: 92185ce59472551443777c1bbc3d4c5e95d48b73 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=92185ce59472551443777c1… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:52 2019 +0100 vkd3d: Fix formatting in is_dual_source_blending(). 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/state.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 065d93c..aa9f62b 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1782,10 +1782,10 @@ static bool is_dual_source_blending_blend(D3D12_BLEND b) static bool is_dual_source_blending(const D3D12_RENDER_TARGET_BLEND_DESC *desc) { return desc->BlendEnable - && (is_dual_source_blending_blend(desc->SrcBlend) - || is_dual_source_blending_blend(desc->DestBlend) - || is_dual_source_blending_blend(desc->SrcBlendAlpha) - || is_dual_source_blending_blend(desc->DestBlendAlpha)); + && (is_dual_source_blending_blend(desc->SrcBlend) + || is_dual_source_blending_blend(desc->DestBlend) + || is_dual_source_blending_blend(desc->SrcBlendAlpha) + || is_dual_source_blending_blend(desc->DestBlendAlpha)); } static HRESULT compute_input_layout_offsets(const D3D12_INPUT_LAYOUT_DESC *input_layout_desc,

1 0

Józef Kucia : vkd3d: Do not enable depth bias unconditionally.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: 1164de705e389c6d24f330ba8c1d26327567bdc6 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=1164de705e389c6d24f330b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:51 2019 +0100 vkd3d: Do not enable depth bias unconditionally. 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/state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 5c7d303..065d93c 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -1538,7 +1538,7 @@ static void rs_desc_from_d3d12(struct VkPipelineRasterizationStateCreateInfo *vk vk_desc->polygonMode = vk_polygon_mode_from_d3d12(d3d12_desc->FillMode); vk_desc->cullMode = vk_cull_mode_from_d3d12(d3d12_desc->CullMode); vk_desc->frontFace = d3d12_desc->FrontCounterClockwise ? VK_FRONT_FACE_COUNTER_CLOCKWISE : VK_FRONT_FACE_CLOCKWISE; - vk_desc->depthBiasEnable = VK_TRUE; + vk_desc->depthBiasEnable = d3d12_desc->DepthBias || d3d12_desc->SlopeScaledDepthBias; vk_desc->depthBiasConstantFactor = d3d12_desc->DepthBias; vk_desc->depthBiasClamp = d3d12_desc->DepthBiasClamp; vk_desc->depthBiasSlopeFactor = d3d12_desc->SlopeScaledDepthBias;

1 0

Józef Kucia : tests: Add NOP test for tessellation shaders.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: b2f286834a0334ecf953a2a4c8db3ffba8cf9e13 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=b2f286834a0334ecf953a2a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:50 2019 +0100 tests: Add NOP test for tessellation shaders. 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 | 157 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 157 insertions(+) diff --git a/tests/d3d12.c b/tests/d3d12.c index 136af92..29f976d 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -21798,6 +21798,162 @@ static void test_layered_rendering(void) destroy_test_context(&context); } +static void test_nop_tessellation_shaders(void) +{ + static const float white[] = {1.0f, 1.0f, 1.0f, 1.0f}; + D3D12_GRAPHICS_PIPELINE_STATE_DESC pso_desc; + ID3D12GraphicsCommandList *command_list; + struct test_context_desc desc; + struct test_context context; + ID3D12CommandQueue *queue; + struct vec4 tess_factors; + HRESULT hr; + + static const DWORD hs_cb_code[] = + { +#if 0 + float4 tess_factor; + + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(InputPatch<data, 3> input, out patch_constant_data output) + { + output.edges[0] = tess_factor.x; + output.edges[1] = tess_factor.y; + output.edges[2] = tess_factor.z; + output.inside = tess_factor.w; + } + + [domain("tri")] + [outputcontrolpoints(3)] + [partitioning("integer")] + [outputtopology("triangle_cw")] + [patchconstantfunc("patch_constant")] + data hs_main(InputPatch<data, 3> input, uint i : SV_OutputControlPointID) + { + return input[i]; + } +#endif + 0x43425844, 0x7e698b53, 0x830de202, 0x4287601f, 0x4315faa4, 0x00000001, 0x00000228, 0x00000004, + 0x00000030, 0x00000064, 0x00000098, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x4e47534f, 0x0000002c, 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, + 0x00000003, 0x00000000, 0x0000000f, 0x505f5653, 0x7469736f, 0x006e6f69, 0x47534350, 0x0000008c, + 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, 0x00000003, 0x00000000, 0x00000e01, + 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, 0x00000e01, 0x00000068, 0x00000002, + 0x0000000d, 0x00000003, 0x00000002, 0x00000e01, 0x00000076, 0x00000000, 0x0000000e, 0x00000003, + 0x00000003, 0x00000e01, 0x545f5653, 0x46737365, 0x6f746361, 0x56530072, 0x736e495f, 0x54656469, + 0x46737365, 0x6f746361, 0xabab0072, 0x58454853, 0x000000f4, 0x00030050, 0x0000003d, 0x01000071, + 0x01001893, 0x01001894, 0x01001095, 0x01000896, 0x01001897, 0x0100086a, 0x04000059, 0x00208e46, + 0x00000000, 0x00000001, 0x01000073, 0x04000067, 0x00102012, 0x00000000, 0x00000011, 0x06000036, + 0x00102012, 0x00000000, 0x0020800a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000001, 0x00000012, 0x06000036, 0x00102012, 0x00000001, 0x0020801a, 0x00000000, + 0x00000000, 0x0100003e, 0x01000073, 0x04000067, 0x00102012, 0x00000002, 0x00000013, 0x06000036, + 0x00102012, 0x00000002, 0x0020802a, 0x00000000, 0x00000000, 0x0100003e, 0x01000073, 0x04000067, + 0x00102012, 0x00000003, 0x00000014, 0x06000036, 0x00102012, 0x00000003, 0x0020803a, 0x00000000, + 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE hs_cb = {hs_cb_code, sizeof(hs_cb_code)}; +#if 0 + struct data + { + float4 position : SV_Position; + }; + + struct patch_constant_data + { + float edges[3] : SV_TessFactor; + float inside : SV_InsideTessFactor; + }; + + void patch_constant(InputPatch<data, 3> input, out patch_constant_data output) + { + output.edges[0] = output.edges[1] = output.edges[2] = 1.0f; + output.inside = 1.0f; + } + + [domain("tri")] + void ds_main(patch_constant_data input, + float3 tess_coord : SV_DomainLocation, + const OutputPatch<data, 3> patch, + out data output) + { + output.position = tess_coord.x * patch[0].position + + tess_coord.y * patch[1].position + + tess_coord.z * patch[2].position; + } +#endif + static const DWORD ds_code[] = + { + 0x43425844, 0x8ed11021, 0x414dff74, 0x426849eb, 0x312f4860, 0x00000001, 0x000001e0, 0x00000004, + 0x00000030, 0x00000064, 0x000000f8, 0x0000012c, 0x4e475349, 0x0000002c, 0x00000001, 0x00000008, + 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x00000f0f, 0x505f5653, 0x7469736f, + 0x006e6f69, 0x47534350, 0x0000008c, 0x00000004, 0x00000008, 0x00000068, 0x00000000, 0x0000000d, + 0x00000003, 0x00000000, 0x00000001, 0x00000068, 0x00000001, 0x0000000d, 0x00000003, 0x00000001, + 0x00000001, 0x00000068, 0x00000002, 0x0000000d, 0x00000003, 0x00000002, 0x00000001, 0x00000076, + 0x00000000, 0x0000000e, 0x00000003, 0x00000003, 0x00000001, 0x545f5653, 0x46737365, 0x6f746361, + 0x56530072, 0x736e495f, 0x54656469, 0x46737365, 0x6f746361, 0xabab0072, 0x4e47534f, 0x0000002c, + 0x00000001, 0x00000008, 0x00000020, 0x00000000, 0x00000001, 0x00000003, 0x00000000, 0x0000000f, + 0x505f5653, 0x7469736f, 0x006e6f69, 0x58454853, 0x000000ac, 0x00040050, 0x0000002b, 0x01001893, + 0x01001095, 0x0100086a, 0x0200005f, 0x0001c072, 0x0400005f, 0x002190f2, 0x00000003, 0x00000000, + 0x04000067, 0x001020f2, 0x00000000, 0x00000001, 0x02000068, 0x00000001, 0x07000038, 0x001000f2, + 0x00000000, 0x0001c556, 0x00219e46, 0x00000001, 0x00000000, 0x09000032, 0x001000f2, 0x00000000, + 0x0001c006, 0x00219e46, 0x00000000, 0x00000000, 0x00100e46, 0x00000000, 0x09000032, 0x001020f2, + 0x00000000, 0x0001caa6, 0x00219e46, 0x00000002, 0x00000000, 0x00100e46, 0x00000000, 0x0100003e, + }; + static const D3D12_SHADER_BYTECODE ds = {ds_code, sizeof(ds_code)}; + + memset(&desc, 0, sizeof(desc)); + desc.no_root_signature = true; + if (!init_test_context(&context, &desc)) + return; + command_list = context.list; + queue = context.queue; + + context.root_signature = create_32bit_constants_root_signature(context.device, + 0, 4, D3D12_SHADER_VISIBILITY_HULL); + + init_pipeline_state_desc(&pso_desc, context.root_signature, + context.render_target_desc.Format, NULL, NULL, NULL); + pso_desc.HS = hs_cb; + pso_desc.DS = ds; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + pso_desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_PATCH; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create state, hr %#x.\n", hr); + + ID3D12GraphicsCommandList_ClearRenderTargetView(command_list, context.rtv, white, 0, NULL); + + ID3D12GraphicsCommandList_OMSetRenderTargets(command_list, 1, &context.rtv, FALSE, NULL); + ID3D12GraphicsCommandList_SetGraphicsRootSignature(command_list, context.root_signature); + ID3D12GraphicsCommandList_SetPipelineState(command_list, context.pipeline_state); + ID3D12GraphicsCommandList_IASetPrimitiveTopology(command_list, D3D_PRIMITIVE_TOPOLOGY_3_CONTROL_POINT_PATCHLIST); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + tess_factors.x = tess_factors.y = tess_factors.z = tess_factors.w = 1.0f; + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &tess_factors.x, 0); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); + + check_sub_resource_uint(context.render_target, 0, queue, command_list, 0xff00ff00, 0); + + destroy_test_context(&context); +} + static void test_render_a8(void) { static const float black[] = {0.0f, 0.0f, 0.0f, 0.0f}; @@ -24142,6 +24298,7 @@ START_TEST(d3d12) run_test(test_multithread_command_queue_exec); run_test(test_geometry_shader); run_test(test_layered_rendering); + run_test(test_nop_tessellation_shaders); run_test(test_render_a8); run_test(test_cpu_descriptors_lifetime); run_test(test_clip_distance);

1 0

Józef Kucia : vkd3d-shader: Implement default control point phase.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: 09dea5f4d99137984364a910df468166fb7a44c7 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=09dea5f4d99137984364a91… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:49 2019 +0100 vkd3d-shader: Implement default control point phase. 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 | 88 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index cc84b40..849ebfb 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1999,6 +1999,8 @@ struct vkd3d_dxbc_compiler uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; + unsigned int input_control_point_count; + unsigned int output_control_point_count; unsigned int shader_phase_count; struct vkd3d_shader_phase *shader_phases; @@ -4740,7 +4742,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_stream(struct vkd3d_dxbc_compiler *comp FIXME("Multiple streams are not supported yet.\n"); } -static void vkd3d_dxbc_compiler_emit_dcl_vertices_out(struct vkd3d_dxbc_compiler *compiler, +static void vkd3d_dxbc_compiler_emit_output_vertex_count(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { vkd3d_dxbc_compiler_emit_execution_mode1(compiler, @@ -4965,6 +4967,77 @@ static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_ph return NULL; } +static void vkd3d_dxbc_compiler_emit_default_control_point_phase(struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_signature *signature = compiler->input_signature; + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t type_id, input_ptr_type_id, output_ptr_type_id; + uint32_t input_id, output_id, dst_id, src_id; + const struct vkd3d_spirv_builtin *builtin; + enum vkd3d_component_type component_type; + unsigned int component_count; + uint32_t invocation_id; + unsigned int i; + + builtin = get_spirv_builtin_for_register(VKD3DSPR_OUTPOINTID); + invocation_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, builtin, SpvStorageClassInput, 0); + + type_id = vkd3d_spirv_get_type_id(builder, builtin->component_type, builtin->component_count); + invocation_id = vkd3d_spirv_build_op_load(builder, type_id, invocation_id, SpvMemoryAccessMaskNone); + + for (i = 0; i < signature->element_count; ++i) + { + const struct vkd3d_shader_signature_element *e = &signature->elements[i]; + + if ((builtin = get_spirv_builtin_for_sysval(compiler, e->sysval_semantic))) + { + component_type = builtin->component_type; + component_count = builtin->component_count; + } + else + { + component_type = e->component_type; + component_count = vkd3d_write_mask_component_count(e->mask & 0xff); + } + + if (builtin) + { + input_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassInput, compiler->input_control_point_count); + } + else + { + input_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassInput, component_type, component_count, compiler->input_control_point_count); + vkd3d_spirv_add_iface_variable(builder, input_id); + vkd3d_spirv_build_op_decorate1(builder, input_id, SpvDecorationLocation, e->register_index); + } + vkd3d_spirv_build_op_name(builder, input_id, "vicp%u", e->register_index); + + if (builtin) + { + output_id = vkd3d_dxbc_compiler_emit_builtin_variable(compiler, + builtin, SpvStorageClassOutput, compiler->output_control_point_count); + } + else + { + output_id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->global_stream, + SpvStorageClassOutput, component_type, component_count, compiler->output_control_point_count); + vkd3d_spirv_add_iface_variable(builder, output_id); + vkd3d_spirv_build_op_decorate1(builder, output_id, SpvDecorationLocation, e->register_index); + } + vkd3d_spirv_build_op_name(builder, output_id, "vocp%u", e->register_index); + + type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); + output_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassOutput, type_id); + input_ptr_type_id = vkd3d_spirv_get_op_type_pointer(builder, SpvStorageClassInput, type_id); + + dst_id = vkd3d_spirv_build_op_access_chain1(builder, output_ptr_type_id, output_id, invocation_id); + src_id = vkd3d_spirv_build_op_access_chain1(builder, input_ptr_type_id, input_id, invocation_id); + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } +} + static void vkd3d_dxbc_compiler_emit_barrier(struct vkd3d_dxbc_compiler *compiler, SpvScope execution_scope, SpvScope memory_scope, SpvMemorySemanticsMask semantics) { @@ -5006,6 +5079,8 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler if ((control_point_phase = vkd3d_dxbc_compiler_get_control_point_phase(compiler))) vkd3d_spirv_build_op_function_call(builder, void_id, control_point_phase->function_id, NULL, 0); + else + vkd3d_dxbc_compiler_emit_default_control_point_phase(compiler); if (scan_info->use_vocp) vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); @@ -7291,8 +7366,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_stream(compiler, instruction); break; case VKD3DSIH_DCL_VERTICES_OUT: - case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: - vkd3d_dxbc_compiler_emit_dcl_vertices_out(compiler, instruction); + vkd3d_dxbc_compiler_emit_output_vertex_count(compiler, instruction); break; case VKD3DSIH_DCL_INPUT_PRIMITIVE: vkd3d_dxbc_compiler_emit_dcl_input_primitive(compiler, instruction); @@ -7303,6 +7377,13 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_GS_INSTANCES: vkd3d_dxbc_compiler_emit_dcl_gs_instances(compiler, instruction); break; + case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: + compiler->input_control_point_count = instruction->declaration.count; + break; + case VKD3DSIH_DCL_OUTPUT_CONTROL_POINT_COUNT: + compiler->output_control_point_count = instruction->declaration.count; + vkd3d_dxbc_compiler_emit_output_vertex_count(compiler, instruction); + break; case VKD3DSIH_DCL_TESSELLATOR_DOMAIN: vkd3d_dxbc_compiler_emit_dcl_tessellator_domain(compiler, instruction); break; @@ -7524,7 +7605,6 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, break; case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_HS_DECLS: - case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: /* nothing to do */ break;

1 0

Józef Kucia : vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_mov().
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: c9fb9c7a7df77c6c90e1fbd6c7a6c03940231bd4 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=c9fb9c7a7df77c6c90e1fbd… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:48 2019 +0100 vkd3d-shader: Simplify vkd3d_dxbc_compiler_emit_mov(). 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 | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 1b33fa1..cc84b40 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -5200,38 +5200,33 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, uint32_t components[VKD3D_VEC4_SIZE]; unsigned int i, component_count; - component_count = vkd3d_write_mask_component_count(dst->write_mask); + if (src->reg.type == VKD3DSPR_IMMCONST || dst->modifiers || src->modifiers) + goto general_implementation; vkd3d_dxbc_compiler_get_register_info(compiler, &dst->reg, &dst_reg_info); - memset(&src_reg_info, 0, sizeof(src_reg_info)); - if (src->reg.type != VKD3DSPR_IMMCONST) - vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); + vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); + + if (dst_reg_info.component_type != src_reg_info.component_type + || dst_reg_info.write_mask != src_reg_info.write_mask) + goto general_implementation; - if (!dst->modifiers && !src->modifiers && src->reg.type != VKD3DSPR_IMMCONST - && dst_reg_info.component_type == src_reg_info.component_type - && dst_reg_info.write_mask == src_reg_info.write_mask - && vkd3d_swizzle_is_equal(dst_reg_info.write_mask, src->swizzle, src_reg_info.write_mask)) + if (vkd3d_swizzle_is_equal(dst_reg_info.write_mask, src->swizzle, src_reg_info.write_mask)) { dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg); vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + return; } - else if (component_count == 1 || component_count == VKD3D_VEC4_SIZE - || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST - || dst_reg_info.component_type != src_reg_info.component_type - || dst_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL - || src_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL) - { - val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); - vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); - } - else + + component_count = vkd3d_write_mask_component_count(dst->write_mask); + if (component_count != 1 && component_count != VKD3D_VEC4_SIZE + && dst_reg_info.write_mask == VKD3DSP_WRITEMASK_ALL) { - type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg); + type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); val_id = vkd3d_spirv_build_op_load(builder, type_id, src_id, SpvMemoryAccessMaskNone); dst_val_id = vkd3d_spirv_build_op_load(builder, type_id, dst_id, SpvMemoryAccessMaskNone); @@ -5247,7 +5242,12 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, type_id, dst_val_id, val_id, components, VKD3D_VEC4_SIZE); vkd3d_spirv_build_op_store(builder, dst_id, val_id, SpvMemoryAccessMaskNone); + return; } + +general_implementation: + val_id = vkd3d_dxbc_compiler_emit_load_src(compiler, src, dst->write_mask); + vkd3d_dxbc_compiler_emit_store_dst(compiler, dst, val_id); } static void vkd3d_dxbc_compiler_emit_movc(struct vkd3d_dxbc_compiler *compiler,

1 0

Józef Kucia : vkd3d-shader: Ignore dcl_hs_max_tessfactor.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: bdae9e30b45ca6d3a7c39c0cf43f3fc502059ec1 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=bdae9e30b45ca6d3a7c39c0… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:47 2019 +0100 vkd3d-shader: Ignore dcl_hs_max_tessfactor. 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 | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d09e289..1b33fa1 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -7522,6 +7522,7 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_CUT_STREAM: vkd3d_dxbc_compiler_emit_cut_stream(compiler, instruction); break; + case VKD3DSIH_DCL_HS_MAX_TESSFACTOR: case VKD3DSIH_HS_DECLS: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP:

1 0

Józef Kucia : vkd3d-shader: Try to use SpvOpCopyMemory for mov instructions.
by Alexandre Julliard 11 Feb '19

11 Feb '19

Module: vkd3d Branch: master Commit: 0498fafbb0617bbca7ab15d3673a06d14e6ca4ef URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0498fafbb0617bbca7ab15d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Feb 11 13:20:46 2019 +0100 vkd3d-shader: Try to use SpvOpCopyMemory for mov instructions. 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 | 34 ++++++++++++++++++++++++++++++---- 1 file changed, 30 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 07cb5fe..d09e289 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1180,6 +1180,17 @@ static void vkd3d_spirv_build_op_store(struct vkd3d_spirv_builder *builder, pointer_id, object_id, memory_access); } +static void vkd3d_spirv_build_op_copy_memory(struct vkd3d_spirv_builder *builder, + uint32_t target_id, uint32_t source_id, uint32_t memory_access) +{ + if (!memory_access) + return vkd3d_spirv_build_op2(&builder->function_stream, SpvOpCopyMemory, + target_id, source_id); + else + return vkd3d_spirv_build_op3(&builder->function_stream, SpvOpCopyMemory, + target_id, source_id, memory_access); +} + static uint32_t vkd3d_spirv_build_op_select(struct vkd3d_spirv_builder *builder, uint32_t result_type, uint32_t condition_id, uint32_t object0_id, uint32_t object1_id) { @@ -2627,6 +2638,12 @@ static uint32_t vkd3d_dxbc_compiler_get_register_id(struct vkd3d_dxbc_compiler * } } +static bool vkd3d_swizzle_is_equal(unsigned int dst_write_mask, + unsigned int swizzle, unsigned int write_mask) +{ + return vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, dst_write_mask) == vkd3d_compact_swizzle(swizzle, write_mask); +} + static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler *compiler, uint32_t val_id, unsigned int val_write_mask, enum vkd3d_component_type component_type, unsigned int swizzle, unsigned int write_mask) @@ -2639,7 +2656,7 @@ static uint32_t vkd3d_dxbc_compiler_emit_swizzle_ext(struct vkd3d_dxbc_compiler val_component_count = vkd3d_write_mask_component_count(val_write_mask); if (component_count == val_component_count - && vkd3d_compact_swizzle(swizzle, write_mask) == vkd3d_compact_swizzle(VKD3D_NO_SWIZZLE, val_write_mask)) + && vkd3d_swizzle_is_equal(val_write_mask, swizzle, write_mask)) return val_id; type_id = vkd3d_spirv_get_type_id(builder, component_type, component_count); @@ -5175,6 +5192,7 @@ static void vkd3d_dxbc_compiler_emit_ext_glsl_instruction(struct vkd3d_dxbc_comp static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register_info dst_reg_info, src_reg_info; const struct vkd3d_shader_dst_param *dst = instruction->dst; const struct vkd3d_shader_src_param *src = instruction->src; @@ -5189,7 +5207,17 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, if (src->reg.type != VKD3DSPR_IMMCONST) vkd3d_dxbc_compiler_get_register_info(compiler, &src->reg, &src_reg_info); - if (component_count == 1 || component_count == VKD3D_VEC4_SIZE + if (!dst->modifiers && !src->modifiers && src->reg.type != VKD3DSPR_IMMCONST + && dst_reg_info.component_type == src_reg_info.component_type + && dst_reg_info.write_mask == src_reg_info.write_mask + && vkd3d_swizzle_is_equal(dst_reg_info.write_mask, src->swizzle, src_reg_info.write_mask)) + { + dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); + src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg); + + vkd3d_spirv_build_op_copy_memory(builder, dst_id, src_id, SpvMemoryAccessMaskNone); + } + else if (component_count == 1 || component_count == VKD3D_VEC4_SIZE || dst->modifiers || src->modifiers || src->reg.type == VKD3DSPR_IMMCONST || dst_reg_info.component_type != src_reg_info.component_type || dst_reg_info.write_mask != VKD3DSP_WRITEMASK_ALL @@ -5200,8 +5228,6 @@ static void vkd3d_dxbc_compiler_emit_mov(struct vkd3d_dxbc_compiler *compiler, } else { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - type_id = vkd3d_spirv_get_type_id(builder, dst_reg_info.component_type, VKD3D_VEC4_SIZE); dst_id = vkd3d_dxbc_compiler_get_register_id(compiler, &dst->reg); src_id = vkd3d_dxbc_compiler_get_register_id(compiler, &src->reg);

1 0

Alexandre Julliard : Merge branch 'lxr'.
by Alexandre Julliard 10 Feb '19

10 Feb '19

Module: tools Branch: master Commit: 2f3cdf445736def27c55255b6638767682b3f015 URL: https://source.winehq.org/git/tools.git/?a=commit;h=2f3cdf445736def27c55255… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Sun Feb 10 17:04:18 2019 +0100 Merge branch 'lxr'. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> ---

1 0

← Newer
1
...
48
49
50
51
52
53
54
...
68
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 February 2019