wine-devel February 2019

wine-devel@winehq.org

73 participants
737 discussions

[PATCH v2 1/3] d3d9: Keep track of D3DUSAGE_AUTOGENMIPMAP textures in the d3d9 device.
by Matteo Bruni 06 Feb '19

06 Feb '19

Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> --- v2: Fix patch according to Józef's review. Supersedes patch 157672. dlls/d3d9/d3d9_private.h | 2 ++ dlls/d3d9/device.c | 23 +++++++++++++++++++++-- dlls/d3d9/stateblock.c | 16 +++++++++++++++- 3 files changed, 38 insertions(+), 3 deletions(-) diff --git a/dlls/d3d9/d3d9_private.h b/dlls/d3d9/d3d9_private.h index 1032f8e8e9c..3fe0376e5c1 100644 --- a/dlls/d3d9/d3d9_private.h +++ b/dlls/d3d9/d3d9_private.h @@ -111,6 +111,8 @@ struct d3d9_device DWORD recording : 1; DWORD padding : 11; + DWORD auto_mipmaps; /* D3D9_MAX_TEXTURE_UNITS */ + unsigned int max_user_clip_planes; UINT implicit_swapchain_count; diff --git a/dlls/d3d9/device.c b/dlls/d3d9/device.c index 98ada03af8b..66bf69589ca 100644 --- a/dlls/d3d9/device.c +++ b/dlls/d3d9/device.c @@ -1012,6 +1012,9 @@ static HRESULT d3d9_device_reset(struct d3d9_device *device, device->device_state = D3D9_DEVICE_STATE_OK; } + if (!device->d3d_parent->extended) + device->auto_mipmaps = 0; + rtv = wined3d_device_get_rendertarget_view(device->wined3d_device, 0); device->render_targets[0] = wined3d_rendertarget_view_get_sub_resource_parent(rtv); for (i = 1; i < ARRAY_SIZE(device->render_targets); ++i) @@ -2456,6 +2459,19 @@ static HRESULT WINAPI d3d9_device_SetTexture(IDirect3DDevice9Ex *iface, DWORD st wined3d_mutex_lock(); hr = wined3d_device_set_texture(device->wined3d_device, stage, texture_impl ? texture_impl->wined3d_texture : NULL); + if (SUCCEEDED(hr) && !device->recording) + { + unsigned int i = stage < 16 || (stage >= D3DVERTEXTEXTURESAMPLER0 && stage <= D3DVERTEXTEXTURESAMPLER3) + ? stage < 16 ? stage : stage - D3DVERTEXTEXTURESAMPLER0 + 16 : ~0u; + + if (i < D3D9_MAX_TEXTURE_UNITS) + { + if (texture_impl && texture_impl->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } + } wined3d_mutex_unlock(); return hr; @@ -2700,10 +2716,13 @@ static float WINAPI d3d9_device_GetNPatchMode(IDirect3DDevice9Ex *iface) static void d3d9_generate_auto_mipmaps(struct d3d9_device *device) { struct wined3d_texture *texture; - unsigned int i, stage; + unsigned int i, stage, map; - for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + map = device->auto_mipmaps; + while (map) { + i = wined3d_bit_scan(&map); + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; if ((texture = wined3d_device_get_texture(device->wined3d_device, stage))) d3d9_texture_gen_auto_mipmap(wined3d_texture_get_parent(texture)); diff --git a/dlls/d3d9/stateblock.c b/dlls/d3d9/stateblock.c index 8431ef77002..14f47d929bc 100644 --- a/dlls/d3d9/stateblock.c +++ b/dlls/d3d9/stateblock.c @@ -109,10 +109,12 @@ static HRESULT WINAPI d3d9_stateblock_Capture(IDirect3DStateBlock9 *iface) static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) { struct d3d9_stateblock *stateblock = impl_from_IDirect3DStateBlock9(iface); + struct wined3d_texture *wined3d_texture; + unsigned int i, offset, stride, stage; struct wined3d_buffer *wined3d_buffer; struct d3d9_vertexbuffer *buffer; - unsigned int i, offset, stride; enum wined3d_format_id format; + struct d3d9_texture *texture; struct d3d9_device *device; HRESULT hr; @@ -134,6 +136,18 @@ static HRESULT WINAPI d3d9_stateblock_Apply(IDirect3DStateBlock9 *iface) } device->sysmem_ib = (wined3d_buffer = wined3d_device_get_index_buffer(device->wined3d_device, &format, &offset)) && (buffer = wined3d_buffer_get_parent(wined3d_buffer)) && buffer->draw_buffer; + device->auto_mipmaps = 0; + for (i = 0; i < D3D9_MAX_TEXTURE_UNITS; ++i) + { + stage = i >= 16 ? i - 16 + D3DVERTEXTEXTURESAMPLER0 : i; + + if ((wined3d_texture = wined3d_device_get_texture(device->wined3d_device, stage)) + && (texture = wined3d_texture_get_parent(wined3d_texture)) + && texture->usage & D3DUSAGE_AUTOGENMIPMAP) + device->auto_mipmaps |= 1u << i; + else + device->auto_mipmaps &= ~(1u << i); + } wined3d_mutex_unlock(); return D3D_OK; -- 2.19.2

4 8

[PATCH] ws2_32: Use heap_realloc instead of HeapReAlloc to avoid an invalid realloc (Valgrind).
by Sven Baars 06 Feb '19

06 Feb '19

Signed-off-by: Sven Baars <sven.wine(a)gmail.com> --- This supersedes 157850. dlls/ws2_32/socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 640726d01e..542dc9a7a8 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -158,6 +158,7 @@ #include "wine/debug.h" #include "wine/exception.h" #include "wine/unicode.h" +#include "wine/heap.h" #if defined(linux) && !defined(IP_UNICAST_IF) #define IP_UNICAST_IF 50 @@ -6272,8 +6273,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) return NULL; adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); routes = HeapAlloc(GetProcessHeap(), 0, route_size); - route_addrs = HeapAlloc(GetProcessHeap(), 0, 0); /* HeapReAlloc doesn't work on NULL */ - if (adapters == NULL || routes == NULL || route_addrs == NULL) + if (adapters == NULL || routes == NULL) goto cleanup; /* Obtain the adapter list and the full routing table */ if (GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) @@ -6306,7 +6306,7 @@ static struct WS_hostent* WS_get_local_ips( char *hostname ) } if (exists) continue; - route_addrs = HeapReAlloc(GetProcessHeap(), 0, route_addrs, (numroutes+1)*sizeof(struct route)); + route_addrs = heap_realloc(route_addrs, (numroutes+1)*sizeof(struct route)); if (route_addrs == NULL) goto cleanup; /* Memory allocation error, fail gracefully */ route_addrs[numroutes].interface = ifindex; -- 2.17.1

1 0

[PATCH vkd3d] tests: Add SetName() tests.
by Henri Verbeet 06 Feb '19

06 Feb '19

From: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Zhiyi Zhang <zzhang(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- tests/d3d12.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/tests/d3d12.c b/tests/d3d12.c index 1b6b917..242b080 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -2740,7 +2740,7 @@ static void test_create_fence(void) ok(!refcount, "ID3D12Device has %u references left.\n", (unsigned int)refcount); } -static void test_private_data(void) +static void test_object_interface(void) { D3D12_DESCRIPTOR_HEAP_DESC descriptor_heap_desc; D3D12_QUERY_HEAP_DESC query_heap_desc; @@ -2763,6 +2763,8 @@ static void test_private_data(void) static const GUID test_guid2 = {0x2e5afac2, 0x87b5, 0x4c10, {0x9b, 0x4b, 0x89, 0xd7, 0xd1, 0x12, 0xe7, 0x2b}}; static const DWORD data[] = {1, 2, 3, 4}; + static const WCHAR deadbeefW[] = {'d', 'e', 'a', 'd', 'b', 'e', 'e', 'f', 0}; + static const WCHAR emptyW[] = {0}; static const GUID *tests[] = { &IID_ID3D12CommandAllocator, @@ -2994,6 +2996,15 @@ static void test_private_data(void) ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); } + hr = ID3D12Object_SetName(object, NULL); + ok(hr == E_INVALIDARG, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, emptyW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + + hr = ID3D12Object_SetName(object, deadbeefW); + ok(hr == S_OK, "Got unexpected hr %#x.\n", hr); + ID3D12Object_Release(object); refcount = IUnknown_Release(test_object); @@ -24042,7 +24053,7 @@ START_TEST(d3d12) run_test(test_create_compute_pipeline_state); run_test(test_create_graphics_pipeline_state); run_test(test_create_fence); - run_test(test_private_data); + run_test(test_object_interface); run_test(test_multithread_private_data); run_test(test_reset_command_allocator); run_test(test_cpu_signal_fence); -- 2.11.0

1 0

[PATCH 3/3] ntoskrnl.exe: Implement ExDeleteNPagedLookasideList.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)

1 0

[PATCH 2/3] ntoskrnl.exe: Implement ExInitializeNPagedLookasideList.
by Jacek Caban 06 Feb '19

06 Feb '19

From: Michael Müller <michael(a)fds-team.de> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 35 +++++++++---- dlls/ntoskrnl.exe/tests/driver.c | 30 +++++++++++ include/ddk/wdm.h | 89 ++++++++++++++++++++++++++++++-- include/winnt.h | 2 + 4 files changed, 144 insertions(+), 12 deletions(-)

1 0

[PATCH 1/3] ntoskrnl.exe: Add PsRevertToSelf stub.
by Jacek Caban 06 Feb '19

06 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- include/ddk/ntifs.h | 1 + 3 files changed, 11 insertions(+), 1 deletion(-)

1 0

[PATCH] hidclass.sys: Prevent buffer overrun
by Aric Stewart 06 Feb '19

06 Feb '19

Signed-off-by: Aric Stewart <aric(a)codeweavers.com> --- dlls/hidclass.sys/descriptor.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[PATCH vkd3d 5/7] vkd3d-shader: Generate functions for hull shader phases.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 105 ++++++++++++++++++++++++++++++++++++-- 1 file changed, 100 insertions(+), 5 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index c91ad6eff7df..67701ccf2241 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1560,8 +1560,6 @@ static uint32_t vkd3d_spirv_get_type_id(struct vkd3d_spirv_builder *builder, static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) { - uint32_t void_id, function_type_id; - vkd3d_spirv_stream_init(&builder->debug_stream); vkd3d_spirv_stream_init(&builder->annotation_stream); vkd3d_spirv_stream_init(&builder->global_stream); @@ -1575,12 +1573,19 @@ static void vkd3d_spirv_builder_init(struct vkd3d_spirv_builder *builder) rb_init(&builder->declarations, vkd3d_spirv_declaration_compare); + builder->main_function_id = vkd3d_spirv_alloc_id(builder); + vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); +} + +static void vkd3d_spirv_builder_begin_main_function(struct vkd3d_spirv_builder *builder) +{ + uint32_t void_id, function_type_id; + void_id = vkd3d_spirv_get_op_type_void(builder); function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); - builder->main_function_id = vkd3d_spirv_build_op_function(builder, void_id, - vkd3d_spirv_alloc_id(builder), SpvFunctionControlMaskNone, function_type_id); - vkd3d_spirv_build_op_name(builder, builder->main_function_id, "main"); + vkd3d_spirv_build_op_function(builder, void_id, + builder->main_function_id, SpvFunctionControlMaskNone, function_type_id); vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); builder->main_function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); } @@ -1899,6 +1904,12 @@ struct vkd3d_push_constant_buffer_binding struct vkd3d_shader_push_constant_buffer pc; }; +struct vkd3d_shader_phase +{ + enum VKD3D_SHADER_INSTRUCTION_HANDLER type; + uint32_t function_id; +}; + struct vkd3d_dxbc_compiler { struct vkd3d_spirv_builder spirv_builder; @@ -1939,6 +1950,10 @@ struct vkd3d_dxbc_compiler uint32_t binding_idx; const struct vkd3d_shader_scan_info *scan_info; + + unsigned int shader_phase_count; + struct vkd3d_shader_phase *shader_phases; + size_t shader_phases_size; }; static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_compiler *compiler); @@ -3807,6 +3822,9 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_execution_mode(compiler, SpvExecutionModeXfb, NULL, 0); } + if (compiler->shader_type != VKD3D_SHADER_TYPE_HULL) + vkd3d_spirv_builder_begin_main_function(builder); + vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } @@ -4662,6 +4680,72 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } +static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + struct vkd3d_shader_phase *phase; + const char *name; + unsigned int id; + + id = compiler->shader_phase_count; + + if (id) + vkd3d_spirv_build_op_function_end(builder); + + if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, + compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) + return; + phase = &compiler->shader_phases[compiler->shader_phase_count++]; + + phase->type = instruction->handler_idx; + phase->function_id = vkd3d_spirv_alloc_id(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, NULL, 0); + vkd3d_spirv_build_op_function(builder, void_id, phase->function_id, + SpvFunctionControlMaskNone, function_type_id); + vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + + switch (instruction->handler_idx) + { + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + name = "control"; + break; + case VKD3DSIH_HS_FORK_PHASE: + name = "fork"; + break; + case VKD3DSIH_HS_JOIN_PHASE: + name = "join"; + break; + default: + ERR("Invalid shader phase %#x.\n", instruction->handler_idx); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); +} + +static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + uint32_t void_id; + unsigned int i; + + vkd3d_spirv_builder_begin_main_function(builder); + + void_id = vkd3d_spirv_get_op_type_void(builder); + for (i = 0; i < compiler->shader_phase_count; ++i) + { + phase = &compiler->shader_phases[i]; + vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + } + + vkd3d_spirv_build_op_return(builder); + vkd3d_spirv_build_op_function_end(builder); +} + static SpvOp vkd3d_dxbc_compiler_map_alu_instruction(const struct vkd3d_shader_instruction *instruction) { static const struct @@ -6944,6 +7028,11 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, case VKD3DSIH_DCL_THREAD_GROUP: vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; + case VKD3DSIH_HS_CONTROL_POINT_PHASE: + case VKD3DSIH_HS_FORK_PHASE: + case VKD3DSIH_HS_JOIN_PHASE: + vkd3d_dxbc_compiler_enter_shader_phase(compiler, instruction); + break; case VKD3DSIH_MOV: vkd3d_dxbc_compiler_emit_mov(compiler, instruction); break; @@ -7142,6 +7231,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_HS_DECLS: case VKD3DSIH_DCL_INPUT_CONTROL_POINT_COUNT: case VKD3DSIH_NOP: /* nothing to do */ @@ -7279,6 +7369,9 @@ int vkd3d_dxbc_compiler_generate_spirv(struct vkd3d_dxbc_compiler *compiler, vkd3d_spirv_build_op_function_end(builder); + if (compiler->shader_type == VKD3D_SHADER_TYPE_HULL) + vkd3d_dxbc_compiler_emit_hull_shader_main(compiler); + if (compiler->epilogue_function_id) vkd3d_dxbc_compiler_emit_shader_epilogue_function(compiler); @@ -7310,5 +7403,7 @@ void vkd3d_dxbc_compiler_destroy(struct vkd3d_dxbc_compiler *compiler) rb_destroy(&compiler->symbol_table, vkd3d_symbol_free, NULL); + vkd3d_free(compiler->shader_phases); + vkd3d_free(compiler); } -- 2.19.2

3 3

[PATCH vkd3d 7/7] vkd3d-shader: Allocate temporary registers per shader phase.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 41 +++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index ae0b1958995c..8efb38530ce9 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1908,6 +1908,7 @@ struct vkd3d_shader_phase { enum VKD3D_SHADER_INSTRUCTION_HANDLER type; uint32_t function_id; + size_t function_location; }; struct vkd3d_dxbc_compiler @@ -3828,6 +3829,26 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + const struct vkd3d_dxbc_compiler *compiler) +{ + if (!compiler->shader_phase_count) + return NULL; + + return &compiler->shader_phases[compiler->shader_phase_count - 1]; +} + +static size_t vkd3d_dxbc_compiler_get_current_function_location(const struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; + + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + return phase->function_location; + + return builder->main_function_location; +} + static void vkd3d_dxbc_compiler_emit_dcl_global_flags(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { @@ -3849,12 +3870,13 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + size_t function_location; unsigned int i; uint32_t id; - vkd3d_spirv_begin_function_stream_insertion(builder, builder->main_function_location); + function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); + vkd3d_spirv_begin_function_stream_insertion(builder, function_location); - assert(!compiler->temp_count); compiler->temp_count = instruction->declaration.count; for (i = 0; i < compiler->temp_count; ++i) { @@ -3877,6 +3899,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_register reg; struct vkd3d_symbol reg_symbol; + size_t function_location; uint32_t id; if (temp->component_count != 4) @@ -3887,7 +3910,8 @@ static void vkd3d_dxbc_compiler_emit_dcl_indexable_temp(struct vkd3d_dxbc_compil reg.idx[0].offset = temp->register_idx; reg.idx[1].offset = ~0u; - vkd3d_spirv_begin_function_stream_insertion(builder, builder->main_function_location); + function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); + vkd3d_spirv_begin_function_stream_insertion(builder, function_location); id = vkd3d_dxbc_compiler_emit_array_variable(compiler, &builder->function_stream, SpvStorageClassFunction, VKD3D_TYPE_FLOAT, VKD3D_VEC4_SIZE, temp->register_size); @@ -4708,6 +4732,8 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c SpvFunctionControlMaskNone, function_type_id); vkd3d_spirv_build_op_label(builder, vkd3d_spirv_alloc_id(builder)); + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + switch (instruction->handler_idx) { case VKD3DSIH_HS_CONTROL_POINT_PHASE: @@ -4726,15 +4752,6 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); } -static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - const struct vkd3d_dxbc_compiler *compiler) -{ - if (!compiler->shader_phase_count) - return NULL; - - return &compiler->shader_phases[compiler->shader_phase_count - 1]; -} - static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; -- 2.19.2

2 1

[PATCH vkd3d 6/7] vkd3d-shader: Do not generate shader epilogue for fork and join shader phases.
by Józef Kucia 06 Feb '19

06 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 67701ccf2241..ae0b1958995c 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4726,6 +4726,15 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, id); } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( + const struct vkd3d_dxbc_compiler *compiler) +{ + if (!compiler->shader_phase_count) + return NULL; + + return &compiler->shader_phases[compiler->shader_phase_count - 1]; +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; @@ -5392,9 +5401,13 @@ static void vkd3d_dxbc_compiler_emit_return(struct vkd3d_dxbc_compiler *compiler const struct vkd3d_shader_instruction *instruction) { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_phase *phase; - if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY) + if (compiler->shader_type != VKD3D_SHADER_TYPE_GEOMETRY + && (!(phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler)) + || phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE)) vkd3d_dxbc_compiler_emit_shader_epilogue_invocation(compiler); + vkd3d_spirv_build_op_return(builder); } -- 2.19.2

2 1

← Newer
1
...
63
64
65
66
67
68
69
...
74
Older →

Jump to page:

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-devel February 2019