February 2019 - Wine-Commits

Zebediah Figura : wined3d: Store the index buffer in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: cc88fb0b691efd771cf43045dccbe9c5b7bc9993 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc88fb0b691efd771cf43045… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Feb 6 19:38:25 2019 -0600 wined3d: Store the index buffer in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 32 +++++++++++++++++++----------- dlls/wined3d/stateblock.c | 45 +++++++++++++++++++++++++++--------------- dlls/wined3d/wined3d_private.h | 4 ++++ 3 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 02bc909..3100991 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1865,24 +1865,32 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = device->update_state->index_buffer; - prev_format = device->update_state->index_format; - prev_offset = device->update_state->index_offset; + prev_buffer = device->state.index_buffer; + prev_format = device->state.index_format; + prev_offset = device->state.index_offset; - device->update_state->index_buffer = buffer; - device->update_state->index_format = format_id; - device->update_state->index_offset = offset; + if (buffer) + wined3d_buffer_incref(buffer); + if (device->update_stateblock_state->index_buffer) + wined3d_buffer_decref(device->update_stateblock_state->index_buffer); + device->update_stateblock_state->index_buffer = buffer; + device->update_stateblock_state->index_format = format_id; if (device->recording) + { device->recording->changed.indices = TRUE; + return; + } if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) return; if (buffer) wined3d_buffer_incref(buffer); - if (!device->recording) - wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); + device->state.index_buffer = buffer; + device->state.index_format = format_id; + device->state.index_offset = offset; + wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1902,7 +1910,9 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I { TRACE("device %p, base_index %d.\n", device, base_index); - device->update_state->base_vertex_index = base_index; + device->update_stateblock_state->base_vertex_index = base_index; + if (!device->recording) + device->state.base_vertex_index = base_index; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) @@ -5232,11 +5242,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso device->state.index_buffer = NULL; } - if (device->recording && &device->update_state->index_buffer->resource == resource) + if (device->recording && &device->update_stateblock_state->index_buffer->resource == resource) { ERR("Buffer resource %p is still in use by stateblock %p as index buffer.\n", resource, device->recording); - device->update_state->index_buffer = NULL; + device->update_stateblock_state->index_buffer = NULL; } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 9c035e5..fe2ff29 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -524,9 +524,16 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { struct wined3d_texture *texture; + struct wined3d_buffer *buffer; struct wined3d_shader *shader; unsigned int i; + if ((buffer = state->index_buffer)) + { + state->index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + if ((shader = state->vs)) { state->vs = NULL; @@ -791,22 +798,20 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.indices - && ((stateblock->state.index_buffer != src_state->index_buffer) - || (stateblock->state.base_vertex_index != src_state->base_vertex_index) - || (stateblock->state.index_format != src_state->index_format) - || (stateblock->state.index_offset != src_state->index_offset))) + && ((stateblock->stateblock_state.index_buffer != state->index_buffer) + || (stateblock->stateblock_state.base_vertex_index != state->base_vertex_index) + || (stateblock->stateblock_state.index_format != state->index_format))) { TRACE("Updating index buffer to %p, base vertex index to %d.\n", - src_state->index_buffer, src_state->base_vertex_index); + state->index_buffer, state->base_vertex_index); - if (src_state->index_buffer) - wined3d_buffer_incref(src_state->index_buffer); - if (stateblock->state.index_buffer) - wined3d_buffer_decref(stateblock->state.index_buffer); - stateblock->state.index_buffer = src_state->index_buffer; - stateblock->state.base_vertex_index = src_state->base_vertex_index; - stateblock->state.index_format = src_state->index_format; - stateblock->state.index_offset = src_state->index_offset; + if (state->index_buffer) + wined3d_buffer_incref(state->index_buffer); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_decref(stateblock->stateblock_state.index_buffer); + stateblock->stateblock_state.index_buffer = state->index_buffer; + stateblock->stateblock_state.base_vertex_index = state->base_vertex_index; + stateblock->stateblock_state.index_format = state->index_format; } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration != src_state->vertex_declaration) @@ -1106,9 +1111,17 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) if (stateblock->changed.indices) { - wined3d_device_set_index_buffer(device, stateblock->state.index_buffer, - stateblock->state.index_format, stateblock->state.index_offset); - wined3d_device_set_base_vertex_index(device, stateblock->state.base_vertex_index); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_incref(stateblock->stateblock_state.index_buffer); + if (state->index_buffer) + wined3d_buffer_decref(state->index_buffer); + state->index_buffer = stateblock->stateblock_state.index_buffer; + state->index_format = stateblock->stateblock_state.index_format; + state->base_vertex_index = stateblock->stateblock_state.base_vertex_index; + + wined3d_device_set_index_buffer(device, stateblock->stateblock_state.index_buffer, + stateblock->stateblock_state.index_format, 0); + wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 66a2ee4..f1b2b7a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2970,6 +2970,10 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { + struct wined3d_buffer *index_buffer; + enum wined3d_format_id index_format; + int base_vertex_index; + struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I];

1 0

Michael Müller : ntoskrnl.exe: Implement NtBuildNumber.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: wine Branch: master Commit: 88b20b2dee5dc246e481a58ddaa983b98e63831c URL: https://source.winehq.org/git/wine.git/?a=commit;h=88b20b2dee5dc246e481a58d… Author: Michael Müller <michael(a)fds-team.de> Date: Wed Feb 6 23:35:18 2019 +0100 ntoskrnl.exe: Implement NtBuildNumber. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntoskrnl.exe/ntoskrnl.c | 2 ++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 13 +++++++++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c1d15cd..aa569d5 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -60,6 +60,7 @@ WINE_DECLARE_DEBUG_CHANNEL(plugplay); BOOLEAN KdDebuggerEnabled = FALSE; ULONG InitSafeBootMode = 0; +USHORT NtBuildNumber = 0; extern LONG CALLBACK vectored_handler( EXCEPTION_POINTERS *ptrs ); @@ -2952,6 +2953,7 @@ BOOL WINAPI DllMain( HINSTANCE inst, DWORD reason, LPVOID reserved ) handler = RtlAddVectoredExceptionHandler( TRUE, vectored_handler ); #endif KeQueryTickCount( &count ); /* initialize the global KeTickCount */ + NtBuildNumber = NtCurrentTeb()->Peb->OSBuildNumber; break; case DLL_PROCESS_DETACH: if (reserved) break; diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index fc162ac..c274966 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -751,7 +751,7 @@ @ stdcall NtAllocateLocallyUniqueId(ptr) @ stdcall NtAllocateUuids(ptr ptr ptr ptr) @ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) -@ stub NtBuildNumber +@ extern NtBuildNumber @ stdcall NtClose(long) @ stdcall NtConnectPort(ptr ptr ptr ptr ptr ptr ptr ptr) @ stdcall NtCreateEvent(ptr long ptr long long) diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c index 5897ac0..3984240 100644 --- a/dlls/ntoskrnl.exe/tests/driver.c +++ b/dlls/ntoskrnl.exe/tests/driver.c @@ -624,6 +624,18 @@ static void test_lookaside_list(void) ExDeleteNPagedLookasideList(&list); } +static void test_version(void) +{ + USHORT *pNtBuildNumber; + ULONG build; + + pNtBuildNumber = get_proc_address("NtBuildNumber"); + ok(!!pNtBuildNumber, "Could not get pointer to NtBuildNumber\n"); + + PsGetVersion(NULL, NULL, &build, NULL); + ok(*pNtBuildNumber == build, "Expected build number %u, got %u\n", build, *pNtBuildNumber); +} + static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack, ULONG_PTR *info) { ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength; @@ -654,6 +666,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st test_init_funcs(); test_load_driver(); test_sync(); + test_version(); test_stack_callout(); test_lookaside_list();

1 0

Józef Kucia : vkd3d-shader: Unset r# registers state while leaving current shader phase.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: fd3d661bf0337fd7534005395323c9c44b127d93 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=fd3d661bf0337fd75340053… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:19 2019 +0100 vkd3d-shader: Unset r# registers state while leaving current shader 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 | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a80925..8f9fff7 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3980,6 +3980,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi 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) { @@ -4810,15 +4811,24 @@ 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_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_function_end(builder); + + compiler->temp_id = 0; + compiler->temp_count = 0; +} + 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; struct vkd3d_shader_phase *phase; unsigned int idx; if ((idx = compiler->shader_phase_count)) - vkd3d_spirv_build_op_function_end(builder); + vkd3d_dxbc_compiler_leave_shader_phase(compiler); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases)))

1 0

Józef Kucia : vkd3d-shader: Translate vForkInstanceId registers.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: 18784e6500e66c6fd01ba8b02ec2fc732f37049e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=18784e6500e66c6fd01ba8b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:16 2019 +0100 vkd3d-shader: Translate vForkInstanceId registers. 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 | 56 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 50 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index f14306e..da9d162 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2320,6 +2320,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_DEPTHOUTLE: snprintf(buffer, buffer_size, "oDepth"); break; + case VKD3DSPR_FORKINSTID: + snprintf(buffer, buffer_size, "vForkInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -2756,12 +2759,21 @@ static uint32_t vkd3d_dxbc_compiler_emit_load_reg(struct vkd3d_dxbc_compiler *co } vkd3d_dxbc_compiler_emit_dereference_register(compiler, reg, &reg_info); - if (component_count == 1) + /* Intermediate value (no storage class). */ + if (reg_info.storage_class == SpvStorageClassMax) + { + val_id = reg_info.id; + } + else if (component_count == 1) + { return vkd3d_dxbc_compiler_emit_load_scalar(compiler, reg, swizzle, write_mask, &reg_info); - - type_id = vkd3d_spirv_get_type_id(builder, - reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); - val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } + else + { + type_id = vkd3d_spirv_get_type_id(builder, + reg_info.component_type, vkd3d_write_mask_component_count(reg_info.write_mask)); + val_id = vkd3d_spirv_build_op_load(builder, type_id, reg_info.id, SpvMemoryAccessMaskNone); + } val_id = vkd3d_dxbc_compiler_emit_swizzle_ext(compiler, val_id, reg_info.write_mask, reg_info.component_type, swizzle, write_mask); @@ -3523,6 +3535,35 @@ static void vkd3d_dxbc_compiler_emit_input_register(struct vkd3d_dxbc_compiler * vkd3d_dxbc_compiler_emit_register_debug_name(builder, input_id, reg); } +static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_phase *phase, const struct vkd3d_shader_dst_param *dst) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + const struct vkd3d_shader_register *reg = &dst->reg; + struct vkd3d_symbol reg_symbol; + uint32_t val_id; + + switch (reg->type) + { + case VKD3DSPR_FORKINSTID: + val_id = phase->instance_id; + break; + default: + FIXME("Unhandled shader phase input register %#x.\n", reg->type); + return; + } + + vkd3d_symbol_make_register(&reg_symbol, reg); + reg_symbol.id = val_id; + reg_symbol.info.reg.storage_class = SpvStorageClassMax; /* Intermediate value */ + reg_symbol.info.reg.member_idx = 0; + reg_symbol.info.reg.component_type = VKD3D_TYPE_UINT; + reg_symbol.info.reg.write_mask = VKD3DSP_WRITEMASK_0; + reg_symbol.info.reg.is_aggregate = false; + vkd3d_dxbc_compiler_put_symbol(compiler, &reg_symbol); + vkd3d_dxbc_compiler_emit_register_debug_name(builder, val_id, reg); +} + static unsigned int vkd3d_dxbc_compiler_get_output_variable_index( struct vkd3d_dxbc_compiler *compiler, unsigned int register_idx) { @@ -4515,8 +4556,11 @@ static void vkd3d_dxbc_compiler_emit_dcl_input(struct vkd3d_dxbc_compiler *compi const struct vkd3d_shader_instruction *instruction) { const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + const struct vkd3d_shader_phase *phase; - if (vkd3d_shader_register_is_input(&dst->reg)) + if ((phase = vkd3d_dxbc_compiler_get_current_shader_phase(compiler))) + vkd3d_dxbc_compiler_emit_shader_phase_input(compiler, phase, dst); + else if (vkd3d_shader_register_is_input(&dst->reg)) vkd3d_dxbc_compiler_emit_input(compiler, dst, VKD3D_SIV_NONE); else vkd3d_dxbc_compiler_emit_input_register(compiler, dst);

1 0

Józef Kucia : vkd3d-shader: Add support for instanced join phases.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: 0397808f8198c1ce7be48f297ffcd2f68a7c934e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=0397808f8198c1ce7be48f2… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:17 2019 +0100 vkd3d-shader: Add support for instanced join phases. 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 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index da9d162..d6d487b 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -2323,6 +2323,9 @@ static bool vkd3d_dxbc_compiler_get_register_name(char *buffer, unsigned int buf case VKD3DSPR_FORKINSTID: snprintf(buffer, buffer_size, "vForkInstanceId"); break; + case VKD3DSPR_JOININSTID: + snprintf(buffer, buffer_size, "vJoinInstanceId"); + break; case VKD3DSPR_TESSCOORD: snprintf(buffer, buffer_size, "vDomainLocation"); break; @@ -3546,6 +3549,7 @@ static void vkd3d_dxbc_compiler_emit_shader_phase_input(struct vkd3d_dxbc_compil switch (reg->type) { case VKD3DSPR_FORKINSTID: + case VKD3DSPR_JOININSTID: val_id = phase->instance_id; break; default: @@ -4829,16 +4833,16 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->function_location = 0; } -static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, +static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; if (!compiler->shader_phase_count - || phase->type != VKD3DSIH_HS_FORK_PHASE + || (phase->type != VKD3DSIH_HS_FORK_PHASE && phase->type != VKD3DSIH_HS_JOIN_PHASE) || phase->function_id) { - WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + WARN("Unexpected dcl_hs_{fork,join}_phase_instance_count instruction.\n"); return VKD3D_ERROR_INVALID_SHADER; } @@ -7170,7 +7174,8 @@ int vkd3d_dxbc_compiler_handle_instruction(struct vkd3d_dxbc_compiler *compiler, vkd3d_dxbc_compiler_emit_dcl_thread_group(compiler, instruction); break; case VKD3DSIH_DCL_HS_FORK_PHASE_INSTANCE_COUNT: - ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + case VKD3DSIH_DCL_HS_JOIN_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_shader_phase_instance_count(compiler, instruction); break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE:

1 0

Józef Kucia : vkd3d-shader: Implement hull shader barriers.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: 59d97b07fe893d98c62db201152723b8bba1f884 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=59d97b07fe893d98c62db20… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:18 2019 +0100 vkd3d-shader: Implement hull shader barriers. 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> --- include/vkd3d_shader.h | 1 + libs/vkd3d-shader/spirv.c | 72 ++++++++++++++++++++++++++--------- libs/vkd3d-shader/vkd3d_shader_main.c | 22 ++++++++++- 3 files changed, 75 insertions(+), 20 deletions(-) diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h index fe6f6e9..e803237 100644 --- a/include/vkd3d_shader.h +++ b/include/vkd3d_shader.h @@ -404,6 +404,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 */ unsigned int sampler_comparison_mode_mask; /* 16 */ + bool use_vocp; }; int vkd3d_shader_scan_dxbc(const struct vkd3d_shader_code *dxbc, diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index d6d487b..3a80925 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -4853,10 +4853,52 @@ static int vkd3d_dxbc_compiler_emit_shader_phase_instance_count(struct vkd3d_dxb return VKD3D_OK; } +static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_control_point_phase( + struct vkd3d_dxbc_compiler *compiler) +{ + const struct vkd3d_shader_phase *phase; + + if (compiler->shader_phase_count < 1) + return NULL; + + phase = &compiler->shader_phases[0]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + return phase; + + return NULL; +} + +static void vkd3d_dxbc_compiler_emit_barrier(struct vkd3d_dxbc_compiler *compiler, + SpvScope execution_scope, SpvScope memory_scope, SpvMemorySemanticsMask semantics) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t execution_id, memory_id, semantics_id; + + memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); + semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, semantics); + + if (execution_scope != SpvScopeMax) + { + execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); + vkd3d_spirv_build_op_control_barrier(builder, execution_id, memory_id, semantics_id); + } + else + { + vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); + } +} + +static void vkd3d_dxbc_compiler_emit_hull_shader_barrier(struct vkd3d_dxbc_compiler *compiler) +{ + vkd3d_dxbc_compiler_emit_barrier(compiler, + SpvScopeWorkgroup, SpvScopeInvocation, SpvMemorySemanticsMaskNone); +} + static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler) { + const struct vkd3d_shader_scan_info *scan_info = compiler->scan_info; struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - const struct vkd3d_shader_phase *phase; + const struct vkd3d_shader_phase *control_point_phase, *phase; uint32_t phase_instance_id; unsigned int i, j; uint32_t void_id; @@ -4864,9 +4906,18 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler vkd3d_spirv_builder_begin_main_function(builder); void_id = vkd3d_spirv_get_op_type_void(builder); + + 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); + + if (scan_info->use_vocp) + vkd3d_dxbc_compiler_emit_hull_shader_barrier(compiler); + for (i = 0; i < compiler->shader_phase_count; ++i) { phase = &compiler->shader_phases[i]; + if (phase->type == VKD3DSIH_HS_CONTROL_POINT_PHASE) + continue; if (phase->instance_count) { @@ -6968,14 +7019,10 @@ static void vkd3d_dxbc_compiler_emit_sample_info(struct vkd3d_dxbc_compiler *com static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; - uint32_t execution_id, memory_id, semantics_id; + unsigned int memory_semantics = SpvMemorySemanticsAcquireReleaseMask; unsigned int flags = instruction->flags; SpvScope execution_scope = SpvScopeMax; SpvScope memory_scope = SpvScopeDevice; - unsigned int memory_semantics; - - memory_semantics = SpvMemorySemanticsAcquireReleaseMask; if (flags & VKD3DSSF_GROUP_SHARED_MEMORY) { @@ -7003,18 +7050,7 @@ static void vkd3d_dxbc_compiler_emit_sync(struct vkd3d_dxbc_compiler *compiler, | SpvMemorySemanticsImageMemoryMask; } - memory_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_scope); - semantics_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, memory_semantics); - if (execution_scope != SpvScopeMax) - { - execution_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, execution_scope); - vkd3d_spirv_build_op_control_barrier(builder, - execution_id, memory_id, semantics_id); - } - else - { - vkd3d_spirv_build_op_memory_barrier(builder, memory_id, semantics_id); - } + vkd3d_dxbc_compiler_emit_barrier(compiler, execution_scope, memory_scope, memory_semantics); } static void vkd3d_dxbc_compiler_emit_emit_stream(struct vkd3d_dxbc_compiler *compiler, diff --git a/libs/vkd3d-shader/vkd3d_shader_main.c b/libs/vkd3d-shader/vkd3d_shader_main.c index 2bfdad0..770281c 100644 --- a/libs/vkd3d-shader/vkd3d_shader_main.c +++ b/libs/vkd3d-shader/vkd3d_shader_main.c @@ -226,6 +226,15 @@ static void vkd3d_shader_scan_record_uav_counter(struct vkd3d_shader_scan_info * scan_info->uav_counter_mask |= 1u << reg->idx[0].offset; } +static void vkd3d_shader_scan_input_declaration(struct vkd3d_shader_scan_info *scan_info, + const struct vkd3d_shader_instruction *instruction) +{ + const struct vkd3d_shader_dst_param *dst = &instruction->declaration.dst; + + if (dst->reg.type == VKD3DSPR_OUTCONTROLPOINT) + scan_info->use_vocp = true; +} + static void vkd3d_shader_scan_sampler_declaration(struct vkd3d_shader_scan_info *scan_info, const struct vkd3d_shader_instruction *instruction) { @@ -242,8 +251,17 @@ static void vkd3d_shader_scan_handle_instruction(struct vkd3d_shader_scan_info * { unsigned int i; - if (instruction->handler_idx == VKD3DSIH_DCL_SAMPLER) - vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + switch (instruction->handler_idx) + { + case VKD3DSIH_DCL_INPUT: + vkd3d_shader_scan_input_declaration(scan_info, instruction); + break; + case VKD3DSIH_DCL_SAMPLER: + vkd3d_shader_scan_sampler_declaration(scan_info, instruction); + break; + default: + break; + } if (vkd3d_shader_instruction_is_uav_read(instruction)) {

1 0

Józef Kucia : vkd3d-shader: Delay generating functions for shader phases.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: e88b73797b4d5a2f38d0f92575ace35bcb23844e URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=e88b73797b4d5a2f38d0f92… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:14 2019 +0100 vkd3d-shader: Delay generating functions for shader phases. Mainly in order to wait for dcl_hs_{fork,join}_phase_instance_count. 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 | 86 ++++++++++++++++++++++++++++------------------- 1 file changed, 51 insertions(+), 35 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 8efb385..e1ea236 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1907,6 +1907,8 @@ struct vkd3d_push_constant_buffer_binding struct vkd3d_shader_phase { enum VKD3D_SHADER_INSTRUCTION_HANDLER type; + unsigned int idx; + unsigned int instance_count; uint32_t function_id; size_t function_location; }; @@ -3829,16 +3831,56 @@ static void vkd3d_dxbc_compiler_emit_initial_declarations(struct vkd3d_dxbc_comp vkd3d_dxbc_compiler_emit_shader_signature_outputs(compiler); } +static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *compiler, + struct vkd3d_shader_phase *phase) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + uint32_t void_id, function_type_id; + const char *name; + + 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)); + + phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); + + switch (phase->type) + { + 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 phase type %#x.\n", phase->type); + return; + } + vkd3d_spirv_build_op_name(builder, phase->function_id, "%s%u", name, phase->idx); +} + static const struct vkd3d_shader_phase *vkd3d_dxbc_compiler_get_current_shader_phase( - const struct vkd3d_dxbc_compiler *compiler) + struct vkd3d_dxbc_compiler *compiler) { + struct vkd3d_shader_phase *phase; + if (!compiler->shader_phase_count) return NULL; - return &compiler->shader_phases[compiler->shader_phase_count - 1]; + phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + if (!phase->function_id) + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + return phase; } -static size_t vkd3d_dxbc_compiler_get_current_function_location(const struct vkd3d_dxbc_compiler *compiler) +static size_t vkd3d_dxbc_compiler_get_current_function_location(struct vkd3d_dxbc_compiler *compiler) { const struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; const struct vkd3d_shader_phase *phase; @@ -4708,14 +4750,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c 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; + unsigned int idx; - if (id) + if ((idx = compiler->shader_phase_count)) vkd3d_spirv_build_op_function_end(builder); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, @@ -4724,32 +4762,10 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c 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)); - - phase->function_location = vkd3d_spirv_stream_current_location(&builder->function_stream); - - 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); + phase->idx = idx; + phase->instance_count = 0; + phase->function_id = 0; + phase->function_location = 0; } static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler *compiler)

1 0

Józef Kucia : vkd3d-shader: Add support for instanced fork phases.
by Alexandre Julliard Feb. 7, 2019

Feb. 7, 2019

Module: vkd3d Branch: master Commit: ea4dd223090f53865bb62086902606160b5e5877 URL: https://source.winehq.org/git/vkd3d.git/?a=commit;h=ea4dd223090f53865bb6208… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Thu Feb 7 09:59:15 2019 +0100 vkd3d-shader: Add support for instanced fork phases. 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 | 62 ++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index e1ea236..f14306e 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -1910,6 +1910,7 @@ struct vkd3d_shader_phase unsigned int idx; unsigned int instance_count; uint32_t function_id; + uint32_t instance_id; size_t function_location; }; @@ -3836,16 +3837,31 @@ static void vkd3d_dxbc_compiler_begin_shader_phase(struct vkd3d_dxbc_compiler *c { struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; uint32_t void_id, function_type_id; + unsigned int param_count; + uint32_t param_type_id; const char *name; + if (phase->instance_count) + { + param_type_id = vkd3d_spirv_get_type_id(builder, VKD3D_TYPE_UINT, 1); + param_count = 1; + } + else + { + param_count = 0; + } + 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); + function_type_id = vkd3d_spirv_get_op_type_function(builder, void_id, &param_type_id, param_count); 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)); + if (phase->instance_count) + phase->instance_id = vkd3d_spirv_build_op_function_parameter(builder, param_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 (phase->type) @@ -4765,15 +4781,37 @@ static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *c phase->idx = idx; phase->instance_count = 0; phase->function_id = 0; + phase->instance_id = 0; phase->function_location = 0; } +static int vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(struct vkd3d_dxbc_compiler *compiler, + const struct vkd3d_shader_instruction *instruction) +{ + struct vkd3d_shader_phase *phase = &compiler->shader_phases[compiler->shader_phase_count - 1]; + + if (!compiler->shader_phase_count + || phase->type != VKD3DSIH_HS_FORK_PHASE + || phase->function_id) + { + WARN("Unexpected dcl_hs_fork_phase_instance_count instruction.\n"); + return VKD3D_ERROR_INVALID_SHADER; + } + + phase->instance_count = instruction->declaration.count; + + vkd3d_dxbc_compiler_begin_shader_phase(compiler, phase); + + return VKD3D_OK; +} + 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 phase_instance_id; + unsigned int i, j; uint32_t void_id; - unsigned int i; vkd3d_spirv_builder_begin_main_function(builder); @@ -4781,7 +4819,20 @@ static void vkd3d_dxbc_compiler_emit_hull_shader_main(struct vkd3d_dxbc_compiler 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); + + if (phase->instance_count) + { + for (j = 0; j < phase->instance_count; ++j) + { + phase_instance_id = vkd3d_dxbc_compiler_get_constant_uint(compiler, j); + vkd3d_spirv_build_op_function_call(builder, + void_id, phase->function_id, &phase_instance_id, 1); + } + } + else + { + vkd3d_spirv_build_op_function_call(builder, void_id, phase->function_id, NULL, 0); + } } vkd3d_spirv_build_op_return(builder); @@ -7074,6 +7125,9 @@ 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_DCL_HS_FORK_PHASE_INSTANCE_COUNT: + ret = vkd3d_dxbc_compiler_emit_hs_fork_phase_instance_count(compiler, instruction); + break; case VKD3DSIH_HS_CONTROL_POINT_PHASE: case VKD3DSIH_HS_FORK_PHASE: case VKD3DSIH_HS_JOIN_PHASE:

1 0

Zebediah Figura : wined3d: Store the material in the wined3d_stateblock_state structure.
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

Module: wine Branch: master Commit: 88d017aa7df3b175ca30af607328a0acdab897e6 URL: https://source.winehq.org/git/wine.git/?a=commit;h=88d017aa7df3b175ca30af60… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Feb 5 23:01:06 2019 -0600 wined3d: Store the material in the wined3d_stateblock_state structure. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 11 +++++++---- dlls/wined3d/stateblock.c | 10 +++++++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e912154..d06ac9c 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1831,12 +1831,15 @@ void CDECL wined3d_device_set_material(struct wined3d_device *device, const stru { TRACE("device %p, material %p.\n", device, material); - device->update_state->material = *material; - + device->update_stateblock_state->material = *material; if (device->recording) + { device->recording->changed.material = TRUE; - else - wined3d_cs_emit_set_material(device->cs, material); + return; + } + + device->state.material = *material; + wined3d_cs_emit_set_material(device->cs, material); } void CDECL wined3d_device_get_material(const struct wined3d_device *device, struct wined3d_material *material) diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index d330821..cf4f7d1 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -822,11 +822,12 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.material - && memcmp(&src_state->material, &stateblock->state.material, sizeof(stateblock->state.material))) + && memcmp(&state->material, &stateblock->stateblock_state.material, + sizeof(stateblock->stateblock_state.material))) { TRACE("Updating material.\n"); - stateblock->state.material = src_state->material; + stateblock->stateblock_state.material = state->material; } assert(src_state->viewport_count <= 1); @@ -1127,7 +1128,10 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) wined3d_device_set_vertex_declaration(device, stateblock->state.vertex_declaration); if (stateblock->changed.material) - wined3d_device_set_material(device, &stateblock->state.material); + { + state->material = stateblock->stateblock_state.material; + wined3d_device_set_material(device, &stateblock->stateblock_state.material); + } if (stateblock->changed.viewport) wined3d_device_set_viewports(device, stateblock->state.viewport_count, stateblock->state.viewports); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d9237e6..6091d21 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2988,6 +2988,7 @@ struct wined3d_stateblock_state struct wined3d_matrix transforms[HIGHEST_TRANSFORMSTATE + 1]; struct wined3d_vec4 clip_planes[MAX_CLIP_DISTANCES]; + struct wined3d_material material; }; struct wined3d_device

1 0

Józef Kucia : d3d9/tests: Use correct index variable in test_resource_access() (Coverity).
by Alexandre Julliard Feb. 6, 2019

Feb. 6, 2019

Module: wine Branch: master Commit: c3ac646a8ded3ef3ebc743a7fdda01b0691a427a URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3ac646a8ded3ef3ebc743a7… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Feb 5 00:59:46 2019 +0100 d3d9/tests: Use correct index variable in test_resource_access() (Coverity). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/d3d9ex.c | 21 +++++++++++++++------ dlls/d3d9/tests/device.c | 25 ++++++++++++++++++++----- 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/dlls/d3d9/tests/d3d9ex.c b/dlls/d3d9/tests/d3d9ex.c index 5260fcd..132ce03 100644 --- a/dlls/d3d9/tests/d3d9ex.c +++ b/dlls/d3d9/tests/d3d9ex.c @@ -4115,6 +4115,7 @@ static void test_resource_access(void) IDirect3DSurface9 *backbuffer, *depth_stencil; D3DFORMAT colour_format, depth_format, format; BOOL depth_2d, depth_cube, depth_plain; + D3DADAPTER_IDENTIFIER9 identifier; struct device_desc device_desc; D3DSURFACE_DESC surface_desc; IDirect3DDevice9Ex *device; @@ -4123,6 +4124,7 @@ static void test_resource_access(void) ULONG refcount; HWND window; HRESULT hr; + BOOL warp; enum surface_type { @@ -4223,6 +4225,9 @@ static void test_resource_access(void) } hr = IDirect3DDevice9Ex_GetDirect3D(device, &d3d); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice9Ex_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -4452,18 +4457,20 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9Ex_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) && tests[i].pool != D3DPOOL_MANAGED - ? D3D_OK : D3DERR_INVALIDCALL), + ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + && tests[i].pool != D3DPOOL_MANAGED ? D3D_OK : D3DERR_INVALIDCALL)) + || (tests[i].format == FORMAT_ATI2 && (hr == D3D_OK || warp)), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; @@ -4481,9 +4488,11 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DVolume9_UnlockBox(volume); - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9Ex_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr); diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9064a67..ad1d289 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -143,6 +143,11 @@ static void flush_events(void) } } +static BOOL adapter_is_warp(const D3DADAPTER_IDENTIFIER9 *identifier) +{ + return !strcmp(identifier->Driver, "d3d10warp.dll"); +} + static IDirect3DDevice9 *create_device(IDirect3D9 *d3d9, HWND focus_window, const struct device_desc *desc) { D3DPRESENT_PARAMETERS present_parameters = {0}; @@ -12650,6 +12655,7 @@ static void test_resource_access(void) IDirect3DSurface9 *backbuffer, *depth_stencil; D3DFORMAT colour_format, depth_format, format; BOOL depth_2d, depth_cube, depth_plain; + D3DADAPTER_IDENTIFIER9 identifier; struct device_desc device_desc; D3DSURFACE_DESC surface_desc; IDirect3DDevice9 *device; @@ -12658,6 +12664,7 @@ static void test_resource_access(void) ULONG refcount; HWND window; HRESULT hr; + BOOL warp; enum surface_type { @@ -12754,6 +12761,9 @@ static void test_resource_access(void) DestroyWindow(window); return; } + hr = IDirect3D9_GetAdapterIdentifier(d3d, D3DADAPTER_DEFAULT, 0, &identifier); + ok(SUCCEEDED(hr), "Failed to get adapter identifier, hr %#x.\n", hr); + warp = adapter_is_warp(&identifier); hr = IDirect3DDevice9_GetBackBuffer(device, 0, 0, D3DBACKBUFFER_TYPE_MONO, &backbuffer); ok(hr == D3D_OK, "Got unexpected hr %#x.\n", hr); @@ -12948,17 +12958,20 @@ static void test_resource_access(void) HRESULT expected_hr; D3DLOCKED_BOX lb; - if (tests[j].format == FORMAT_DEPTH) + if (tests[i].format == FORMAT_DEPTH) continue; - if (tests[j].format == FORMAT_ATI2) + if (tests[i].format == FORMAT_ATI2) format = MAKEFOURCC('A','T','I','2'); else format = colour_format; hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + ok((hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) + && (tests[i].format != FORMAT_ATI2 || tests[i].pool == D3DPOOL_SCRATCH) + ? D3D_OK : D3DERR_INVALIDCALL)) + || (tests[i].format == FORMAT_ATI2 && (hr == D3D_OK || warp)), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; @@ -12976,9 +12989,11 @@ static void test_resource_access(void) expected_hr = D3D_OK; else expected_hr = D3DERR_INVALIDCALL; - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DVolume9_UnlockBox(volume); - ok(hr == expected_hr, "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == expected_hr || (volume_desc.Pool == D3DPOOL_DEFAULT && hr == D3D_OK), + "Test %u: Got unexpected hr %#x.\n", i, hr); hr = IDirect3DDevice9_SetTexture(device, 0, (IDirect3DBaseTexture9 *)texture); ok(hr == D3D_OK, "Test %u: Got unexpected hr %#x.\n", i, hr);

1 0