May 2019 - Wine-Devel - list.winehq.org

[PATCH vkd3d 3/8] vkd3d: Disable unncessary depth tests.
by Józef Kucia May 17, 2019

May 17, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Allows us to create the render pass while creating the pipeline state. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/state.c | 13 ++++++++++--- tests/d3d12.c | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index b3348d601b9e..7bce6143c4a1 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2228,8 +2228,17 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->rtv_formats[i] = VK_FORMAT_UNDEFINED; graphics->rt_count = rt_count; + ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); + if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN + && graphics->ds_desc.depthTestEnable && !graphics->ds_desc.depthWriteEnable + && graphics->ds_desc.depthCompareOp == VK_COMPARE_OP_ALWAYS && !graphics->ds_desc.stencilTestEnable) + { + TRACE("Disabling depth test.\n"); + graphics->ds_desc.depthTestEnable = VK_FALSE; + } + graphics->dsv_format = VK_FORMAT_UNDEFINED; - if (desc->DepthStencilState.DepthEnable || desc->DepthStencilState.StencilEnable) + if (graphics->ds_desc.depthTestEnable || graphics->ds_desc.stencilTestEnable) { if (desc->DSVFormat == DXGI_FORMAT_UNKNOWN) { @@ -2545,8 +2554,6 @@ static HRESULT d3d12_pipeline_state_init_graphics(struct d3d12_pipeline_state *s graphics->ms_desc.alphaToCoverageEnable = desc->BlendState.AlphaToCoverageEnable; graphics->ms_desc.alphaToOneEnable = VK_FALSE; - ds_desc_from_d3d12(&graphics->ds_desc, &desc->DepthStencilState); - if (graphics->dsv_format == VK_FORMAT_UNDEFINED) graphics->render_pass = VK_NULL_HANDLE; else if (FAILED(hr = d3d12_graphics_pipeline_state_create_render_pass(graphics, diff --git a/tests/d3d12.c b/tests/d3d12.c index 36bc41cd23c2..c7dfd8a3ed1c 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4963,6 +4963,39 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + /* DSVFormat = DXGI_FORMAT_UNKNOWN and D3D12_COMPARISON_FUNC_ALWAYS */ + ID3D12PipelineState_Release(context.pipeline_state); + pso_desc.DepthStencilState.DepthFunc = D3D12_COMPARISON_FUNC_ALWAYS; + hr = ID3D12Device_CreateGraphicsPipelineState(context.device, &pso_desc, + &IID_ID3D12PipelineState, (void **)&context.pipeline_state); + ok(hr == S_OK, "Failed to create graphics pipeline state, hr %#x.\n", hr); + + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + 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_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.6f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + 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_vec4(context.render_target, 0, queue, command_list, &green, 0); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH vkd3d 1/8] vkd3d: Fix draw calls without depth-stencil view.
by Józef Kucia May 17, 2019

May 17, 2019

From: Józef Kucia <jkucia(a)codeweavers.com> Fixes a regression introduced by 9eba55403d9a3b9cd58f76a6f14ddf5f745df73a. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d/command.c | 7 ++++++- libs/vkd3d/state.c | 20 +++++++++++--------- tests/d3d12.c | 29 +++++++++++++++++++++++++++++ 3 files changed, 46 insertions(+), 10 deletions(-) diff --git a/libs/vkd3d/command.c b/libs/vkd3d/command.c index edf13d688d9a..1c518f3b7120 100644 --- a/libs/vkd3d/command.c +++ b/libs/vkd3d/command.c @@ -2340,6 +2340,7 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l VkFramebuffer vk_framebuffer; unsigned int view_count; size_t start_idx = 0; + bool null_attachment; unsigned int i; VkResult vr; @@ -2353,7 +2354,11 @@ static bool d3d12_command_list_update_current_framebuffer(struct d3d12_command_l for (i = 0, view_count = 0; i < graphics->attachment_count; ++i) { - if (graphics->null_attachment_mask & (1u << i)) + null_attachment = graphics->null_attachment_mask & (1u << i); + if (graphics->rt_idx && i == 0) + null_attachment = list->dsv_format == VK_FORMAT_UNDEFINED; + + if (null_attachment) { if (list->views[start_idx + i]) WARN("Expected NULL view for attachment %u.\n", i); diff --git a/libs/vkd3d/state.c b/libs/vkd3d/state.c index 457f3d9bc84b..5d2f49019364 100644 --- a/libs/vkd3d/state.c +++ b/libs/vkd3d/state.c @@ -2058,21 +2058,21 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( VkFormat dynamic_dsv_format, VkRenderPass *vk_render_pass) { struct vkd3d_render_pass_key key; - unsigned int i; + VkFormat dsv_format; + unsigned int i = 0; + + dsv_format = graphics->rt_idx ? + graphics->dsv_format ? graphics->dsv_format : dynamic_dsv_format + : VK_FORMAT_UNDEFINED; - if (graphics->rt_idx) + if (dsv_format) { assert(graphics->ds_desc.front.writeMask == graphics->ds_desc.back.writeMask); key.depth_enable = graphics->ds_desc.depthTestEnable; key.stencil_enable = graphics->ds_desc.stencilTestEnable; key.depth_stencil_write = graphics->ds_desc.depthWriteEnable || graphics->ds_desc.front.writeMask; - - if (!(key.vk_formats[0] = graphics->dsv_format)) - key.vk_formats[0] = dynamic_dsv_format; - - if (!key.vk_formats[0]) - FIXME("Compiling with DXGI_FORMAT_UNKNOWN.\n"); + key.vk_formats[i++] = dsv_format; } else { @@ -2082,11 +2082,13 @@ static HRESULT d3d12_graphics_pipeline_state_create_render_pass( key.vk_formats[ARRAY_SIZE(key.vk_formats) - 1] = VK_FORMAT_UNDEFINED; } - memcpy(&key.vk_formats[graphics->rt_idx], graphics->rtv_formats, sizeof(graphics->rtv_formats)); + memcpy(&key.vk_formats[i], graphics->rtv_formats, sizeof(graphics->rtv_formats)); for (i = graphics->attachment_count; i < ARRAY_SIZE(key.vk_formats); ++i) assert(key.vk_formats[i] == VK_FORMAT_UNDEFINED); key.attachment_count = graphics->attachment_count; + if (!dsv_format && graphics->rt_idx) + --key.attachment_count; key.padding = 0; key.sample_count = graphics->ms_desc.rasterizationSamples; diff --git a/tests/d3d12.c b/tests/d3d12.c index 305d08776de2..36bc41cd23c2 100644 --- a/tests/d3d12.c +++ b/tests/d3d12.c @@ -4934,6 +4934,35 @@ static void test_unknown_dsv_format(void) D3D12_RESOURCE_STATE_RENDER_TARGET, D3D12_RESOURCE_STATE_COPY_SOURCE); check_sub_resource_vec4(context.render_target, 0, queue, command_list, &green, 0); + /* DSVFormat = DXGI_FORMAT_UNKNOWN and no DSV */ + reset_command_list(command_list, context.allocator); + transition_resource_state(command_list, ds.texture, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_DEPTH_WRITE); + transition_resource_state(command_list, context.render_target, + D3D12_RESOURCE_STATE_COPY_SOURCE, D3D12_RESOURCE_STATE_RENDER_TARGET); + + 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_TRIANGLELIST); + ID3D12GraphicsCommandList_RSSetScissorRects(command_list, 1, &context.scissor_rect); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &red.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 0.0f, 0.0f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + ID3D12GraphicsCommandList_DrawInstanced(command_list, 3, 1, 0, 0); + + ID3D12GraphicsCommandList_SetGraphicsRoot32BitConstants(command_list, 0, 4, &green.x, 0); + set_viewport(&context.viewport, 0.0f, 0.0f, 32.0f, 32.0f, 1.0f, 0.5f); + ID3D12GraphicsCommandList_RSSetViewports(command_list, 1, &context.viewport); + 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_vec4(context.render_target, 0, queue, command_list, &green, 0); + destroy_depth_stencil(&ds); destroy_test_context(&context); } -- 2.21.0

2 1

[PATCH 5/5] wined3d: Use wined3d_texture_get_level_box() in wined3d_device_update_texture().
by Henri Verbeet May 17, 2019

May 17, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/device.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 5272e2ef236..5a94d03b9bb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3821,7 +3821,6 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, unsigned int src_size, dst_size, src_skip_levels = 0; unsigned int src_level_count, dst_level_count; unsigned int layer_count, level_count, i, j; - unsigned int width, height, depth; enum wined3d_resource_type type; struct wined3d_box box; @@ -3892,11 +3891,7 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, /* Update every surface level of the texture. */ for (i = 0; i < level_count; ++i) { - width = wined3d_texture_get_level_width(dst_texture, i); - height = wined3d_texture_get_level_height(dst_texture, i); - depth = wined3d_texture_get_level_depth(dst_texture, i); - wined3d_box_set(&box, 0, 0, width, height, 0, depth); - + wined3d_texture_get_level_box(dst_texture, i, &box); for (j = 0; j < layer_count; ++j) { wined3d_cs_emit_blt_sub_resource(device->cs, -- 2.11.0

2 1

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to context_apply_compute_state().
by Henri Verbeet May 17, 2019

May 17, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 54 ++++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 26 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bd30c1425f4..5735d02a5af 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -4037,51 +4037,51 @@ static BOOL context_apply_draw_state(struct wined3d_context *context, return TRUE; } -static void context_apply_compute_state(struct wined3d_context *context, +static void wined3d_context_gl_apply_compute_state(struct wined3d_context_gl *context_gl, const struct wined3d_device *device, const struct wined3d_state *state) { - const struct wined3d_state_entry *state_table = context->state_table; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_state_entry *state_table = context_gl->c.state_table; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; unsigned int state_id, i; - context_load_shader_resources(context, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); - context_load_unordered_access_resources(context, state->shader[WINED3D_SHADER_TYPE_COMPUTE], + context_load_shader_resources(&context_gl->c, state, 1u << WINED3D_SHADER_TYPE_COMPUTE); + context_load_unordered_access_resources(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context->dirty_compute_states); ++i) + for (i = 0, state_id = STATE_COMPUTE_OFFSET; i < ARRAY_SIZE(context_gl->c.dirty_compute_states); ++i) { - unsigned int dirty_mask = context->dirty_compute_states[i]; + unsigned int dirty_mask = context_gl->c.dirty_compute_states[i]; + while (dirty_mask) { unsigned int current_state_id = state_id + wined3d_bit_scan(&dirty_mask); - state_table[current_state_id].apply(context, state, current_state_id); + state_table[current_state_id].apply(&context_gl->c, state, current_state_id); } - state_id += sizeof(*context->dirty_compute_states) * CHAR_BIT; + state_id += sizeof(*context_gl->c.dirty_compute_states) * CHAR_BIT; } - memset(context->dirty_compute_states, 0, sizeof(*context->dirty_compute_states)); + memset(context_gl->c.dirty_compute_states, 0, sizeof(*context_gl->c.dirty_compute_states)); - if (context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) + if (context_gl->c.shader_update_mask & (1u << WINED3D_SHADER_TYPE_COMPUTE)) { - device->shader_backend->shader_select_compute(device->shader_priv, context, state); - context->shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); + device->shader_backend->shader_select_compute(device->shader_priv, &context_gl->c, state); + context_gl->c.shader_update_mask &= ~(1u << WINED3D_SHADER_TYPE_COMPUTE); } - if (context->update_compute_shader_resource_bindings) + if (context_gl->c.update_compute_shader_resource_bindings) { - wined3d_context_gl_bind_shader_resources(wined3d_context_gl(context), state, WINED3D_SHADER_TYPE_COMPUTE); - context->update_compute_shader_resource_bindings = 0; + wined3d_context_gl_bind_shader_resources(context_gl, state, WINED3D_SHADER_TYPE_COMPUTE); + context_gl->c.update_compute_shader_resource_bindings = 0; if (gl_info->limits.combined_samplers == gl_info->limits.graphics_samplers) - context->update_shader_resource_bindings = 1; + context_gl->c.update_shader_resource_bindings = 1; } - if (context->update_compute_unordered_access_view_bindings) + if (context_gl->c.update_compute_unordered_access_view_bindings) { - context_bind_unordered_access_views(context, + context_bind_unordered_access_views(&context_gl->c, state->shader[WINED3D_SHADER_TYPE_COMPUTE], state->unordered_access_view[WINED3D_PIPELINE_COMPUTE]); - context->update_compute_unordered_access_view_bindings = 0; - context->update_unordered_access_view_bindings = 1; + context_gl->c.update_compute_unordered_access_view_bindings = 0; + context_gl->c.update_unordered_access_view_bindings = 1; } /* Updates to currently bound render targets aren't necessarily coherent @@ -4092,10 +4092,10 @@ static void context_apply_compute_state(struct wined3d_context *context, * Without this, the bloom effect in Nier:Automata is too bright on the * Mesa radeonsi driver, and presumably on other Mesa based drivers. */ wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context_invalidate_state(context, STATE_FRAMEBUFFER); + context_invalidate_state(&context_gl->c, STATE_FRAMEBUFFER); - context->last_was_blit = FALSE; - context->last_was_ffp_blit = FALSE; + context_gl->c.last_was_blit = FALSE; + context_gl->c.last_was_ffp_blit = FALSE; } static BOOL use_transform_feedback(const struct wined3d_state *state) @@ -4311,6 +4311,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state const struct wined3d_dispatch_parameters *parameters) { const struct wined3d_gl_info *gl_info; + struct wined3d_context_gl *context_gl; struct wined3d_context *context; context = context_acquire(device, NULL, 0); @@ -4320,6 +4321,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state WARN("Invalid context, skipping dispatch.\n"); return; } + context_gl = wined3d_context_gl(context); gl_info = context->gl_info; if (!gl_info->supported[ARB_COMPUTE_SHADER]) @@ -4332,7 +4334,7 @@ void dispatch_compute(struct wined3d_device *device, const struct wined3d_state if (parameters->indirect) wined3d_buffer_load(parameters->u.indirect.buffer, context, state); - context_apply_compute_state(context, device, state); + wined3d_context_gl_apply_compute_state(context_gl, device, state); if (!state->shader[WINED3D_SHADER_TYPE_COMPUTE]) { -- 2.11.0

2 1

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to context_queue_fbo_entry_destruction().
by Henri Verbeet May 17, 2019

May 17, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 88ac2eeaa1c..bd30c1425f4 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1038,27 +1038,27 @@ void wined3d_context_gl_free_pipeline_statistics_query(struct wined3d_pipeline_s context_gl->free_pipeline_statistics_queries[context_gl->free_pipeline_statistics_query_count++] = query->u; } -typedef void (context_fbo_entry_func_t)(struct wined3d_context *context, struct fbo_entry *entry); +typedef void (context_fbo_entry_func_t)(struct wined3d_context_gl *context_gl, struct fbo_entry *entry); -static void context_enum_fbo_entries(const struct wined3d_device *device, +static void wined3d_context_gl_enum_fbo_entries(const struct wined3d_device *device, GLuint name, BOOL rb_namespace, context_fbo_entry_func_t *callback) { unsigned int i, j; for (i = 0; i < device->context_count; ++i) { - struct wined3d_context *context = device->contexts[i]; - const struct wined3d_gl_info *gl_info = context->gl_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(device->contexts[i]); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_list, struct fbo_entry, entry) { for (j = 0; j < gl_info->limits.buffers + 1; ++j) { if (entry->key.objects[j].object == name && !(entry->key.rb_namespace & (1 << j)) == !rb_namespace) { - callback(context, entry); + callback(context_gl, entry); break; } } @@ -1066,10 +1066,11 @@ static void context_enum_fbo_entries(const struct wined3d_device *device, } } -static void context_queue_fbo_entry_destruction(struct wined3d_context *context, struct fbo_entry *entry) +static void wined3d_context_gl_queue_fbo_entry_destruction(struct wined3d_context_gl *context_gl, + struct fbo_entry *entry) { list_remove(&entry->entry); - list_add_head(&context->fbo_destroy_list, &entry->entry); + list_add_head(&context_gl->c.fbo_destroy_list, &entry->entry); } void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) @@ -1091,10 +1092,10 @@ void context_resource_released(const struct wined3d_device *device, struct wined } } -void context_gl_resource_released(struct wined3d_device *device, - GLuint name, BOOL rb_namespace) +void context_gl_resource_released(struct wined3d_device *device, GLuint name, BOOL rb_namespace) { - context_enum_fbo_entries(device, name, rb_namespace, context_queue_fbo_entry_destruction); + wined3d_context_gl_enum_fbo_entries(device, name, rb_namespace, + wined3d_context_gl_queue_fbo_entry_destruction); } void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, -- 2.11.0

2 1

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_state().
by Henri Verbeet May 17, 2019

May 17, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index aa4606e1574..88ac2eeaa1c 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -757,34 +757,33 @@ static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_state(struct wined3d_context *context, GLenum target, +static void wined3d_context_gl_apply_fbo_state(struct wined3d_context_gl *context_gl, GLenum target, const struct wined3d_rendertarget_info *render_targets, const struct wined3d_rendertarget_info *depth_stencil, DWORD color_location, DWORD ds_location) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct fbo_entry *entry, *entry2; - LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context->fbo_destroy_list, struct fbo_entry, entry) + LIST_FOR_EACH_ENTRY_SAFE(entry, entry2, &context_gl->c.fbo_destroy_list, struct fbo_entry, entry) { wined3d_context_gl_destroy_fbo_entry(context_gl, entry); } - if (context->rebind_fbo) + if (context_gl->c.rebind_fbo) { wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, 0); - context->rebind_fbo = FALSE; + context_gl->c.rebind_fbo = FALSE; } if (color_location == WINED3D_LOCATION_DRAWABLE) { - context->current_fbo = NULL; + context_gl->c.current_fbo = NULL; wined3d_context_gl_bind_fbo(context_gl, target, 0); } else { - context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, + context_gl->c.current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context_gl->c.current_fbo); } } @@ -810,7 +809,7 @@ void wined3d_context_gl_apply_fbo_state_blit(struct wined3d_context_gl *context_ ds_info.layer_count = 1; } - context_apply_fbo_state(&context_gl->c, target, context_gl->c.blit_targets, &ds_info, location, location); + wined3d_context_gl_apply_fbo_state(context_gl, target, context_gl->c.blit_targets, &ds_info, location, location); } /* Context activation is done by the caller. */ @@ -3060,13 +3059,13 @@ BOOL wined3d_context_gl_apply_clear_state(struct wined3d_context_gl *context_gl, ds_info.layer_count = dsv_gl->v.layer_count; } - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context_gl->c.blit_targets, &ds_info, rt_count ? rts[0]->resource->draw_binding : 0, dsv ? dsv->resource->draw_binding : 0); } else { - context_apply_fbo_state(&context_gl->c, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); rt_mask = context_generate_rt_mask_from_resource(rts[0]->resource); } @@ -3162,6 +3161,7 @@ static unsigned int find_draw_buffers_mask(const struct wined3d_context *context /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; @@ -3173,7 +3173,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat if (!context->render_offscreen) { - context_apply_fbo_state(context, GL_FRAMEBUFFER, NULL, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, NULL, &ds_info, WINED3D_LOCATION_DRAWABLE, WINED3D_LOCATION_DRAWABLE); } else @@ -3206,7 +3206,7 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat ds_info.layer_count = view_gl->v.layer_count; } - context_apply_fbo_state(context, GL_FRAMEBUFFER, context->blit_targets, &ds_info, + wined3d_context_gl_apply_fbo_state(context_gl, GL_FRAMEBUFFER, context->blit_targets, &ds_info, color_location, fb->depth_stencil ? fb->depth_stencil->resource->draw_binding : 0); } } -- 2.11.0

2 1

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to context_apply_fbo_entry().
by Henri Verbeet May 17, 2019

May 17, 2019

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 7cd16d5b7ea..aa4606e1574 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -704,10 +704,10 @@ static struct fbo_entry *wined3d_context_gl_find_fbo_entry(struct wined3d_contex } /* Context activation is done by the caller. */ -static void context_apply_fbo_entry(struct wined3d_context *context, GLenum target, struct fbo_entry *entry) +static void wined3d_context_gl_apply_fbo_entry(struct wined3d_context_gl *context_gl, + GLenum target, struct fbo_entry *entry) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GLuint read_binding, draw_binding; unsigned int i; @@ -717,8 +717,8 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ return; } - read_binding = context->fbo_read_binding; - draw_binding = context->fbo_draw_binding; + read_binding = context_gl->c.fbo_read_binding; + draw_binding = context_gl->c.fbo_draw_binding; wined3d_context_gl_bind_fbo(context_gl, GL_FRAMEBUFFER, entry->id); if (gl_info->supported[ARB_FRAMEBUFFER_NO_ATTACHMENTS]) @@ -734,11 +734,11 @@ static void context_apply_fbo_entry(struct wined3d_context *context, GLenum targ /* Apply render targets */ for (i = 0; i < gl_info->limits.buffers; ++i) { - context_attach_surface_fbo(context, target, i, &entry->key.objects[i + 1], + context_attach_surface_fbo(&context_gl->c, target, i, &entry->key.objects[i + 1], entry->key.rb_namespace & (1 << (i + 1))); } - context_attach_depth_stencil_fbo(context, target, &entry->key.objects[0], + context_attach_depth_stencil_fbo(&context_gl->c, target, &entry->key.objects[0], entry->key.rb_namespace & 0x1, entry->flags); /* Set valid read and draw buffer bindings to satisfy pedantic pre-ES2_compatibility @@ -784,7 +784,7 @@ static void context_apply_fbo_state(struct wined3d_context *context, GLenum targ { context->current_fbo = wined3d_context_gl_find_fbo_entry(context_gl, target, render_targets, depth_stencil, color_location, ds_location); - context_apply_fbo_entry(context, target, context->current_fbo); + wined3d_context_gl_apply_fbo_entry(context_gl, target, context->current_fbo); } } -- 2.11.0

2 1

[v2 PATCH 1/4] kernelbase: Use a helper to get character C1 type.
by Nikolay Sivov May 17, 2019

May 17, 2019

Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> --- dlls/kernelbase/string.c | 31 +++++++++++++------------------ 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/dlls/kernelbase/string.c b/dlls/kernelbase/string.c index 4991ba3fd1..6f38fc3b3d 100644 --- a/dlls/kernelbase/string.c +++ b/dlls/kernelbase/string.c @@ -28,6 +28,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(string); +static WORD get_char_type(WCHAR ch) +{ + WORD type = 0; + GetStringTypeW(CT_CTYPE1, &ch, 1, &type); + return type; +} + DWORD WINAPI StrCmpCA(const char *str, const char *cmp) { return lstrcmpA(str, cmp); @@ -60,30 +67,22 @@ DWORD WINAPI StrCmpNICW(const WCHAR *str, const WCHAR *cmp, DWORD len) BOOL WINAPI IsCharBlankW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_BLANK); + return !!(get_char_type(wc) & C1_BLANK); } BOOL WINAPI IsCharCntrlW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_CNTRL); + return !!(get_char_type(wc) & C1_CNTRL); } BOOL WINAPI IsCharDigitW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_DIGIT); + return !!(get_char_type(wc) & C1_DIGIT); } BOOL WINAPI IsCharPunctW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_PUNCT); + return !!(get_char_type(wc) & C1_PUNCT); } BOOL WINAPI IsCharSpaceA(CHAR c) @@ -94,16 +93,12 @@ BOOL WINAPI IsCharSpaceA(CHAR c) BOOL WINAPI IsCharSpaceW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_SPACE); + return !!(get_char_type(wc) & C1_SPACE); } BOOL WINAPI IsCharXDigitW(WCHAR wc) { - WORD type; - - return GetStringTypeW(CT_CTYPE1, &wc, 1, &type) && (type & C1_XDIGIT); + return !!(get_char_type(wc) & C1_XDIGIT); } WCHAR * WINAPI StrChrW(const WCHAR *str, WCHAR ch) -- 2.20.1

1 3

[PATCH] setuapi: fixed size to MBtoWC
by Marcus Meissner May 17, 2019

May 17, 2019

Signed-off-by: Marcus Meissner <marcus(a)jet.franken.de> --- dlls/setupapi/devinst.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c index 48b6ca30f0..5135d3f62a 100644 --- a/dlls/setupapi/devinst.c +++ b/dlls/setupapi/devinst.c @@ -3579,7 +3579,7 @@ BOOL WINAPI SetupDiSetDeviceInstallParamsA(HDEVINFO devinfo, paramsW.FileQueue = params->FileQueue; paramsW.ClassInstallReserved = params->ClassInstallReserved; paramsW.Reserved = params->Reserved; - MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, sizeof(paramsW.DriverPath)); + MultiByteToWideChar(CP_ACP, 0, params->DriverPath, -1, paramsW.DriverPath, ARRAY_SIZE(paramsW.DriverPath)); return SetupDiSetDeviceInstallParamsW(devinfo, device_data, &paramsW); } -- 2.21.0

2 1

[PATCH v7 1/2] jscript: implement Enumerator()
by Andreas Maier May 17, 2019

May 17, 2019

Signed-off-by: Andreas Maier <staubim(a)quantentunnel.de> --- dlls/jscript/enumerator.c | 207 ++++++++++++++++++++++++++++++++++++++++++---- dlls/jscript/jscript.h | 2 + dlls/jscript/object.c | 2 +- dlls/jscript/resource.h | 1 + 4 files changed, 194 insertions(+), 18 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index d0502f6afa..86298310f2 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -26,6 +26,11 @@ WINE_DEFAULT_DEBUG_CHANNEL(jscript); typedef struct { jsdisp_t dispex; + /* IEnumVARIANT returned by _NewEnum */ + IEnumVARIANT *enumvar; + /* current item */ + jsval_t item; + BOOL atend; } EnumeratorInstance; static const WCHAR atEndW[] = {'a','t','E','n','d',0}; @@ -33,43 +38,136 @@ static const WCHAR itemW[] = {'i','t','e','m',0}; static const WCHAR moveFirstW[] = {'m','o','v','e','F','i','r','s','t',0}; static const WCHAR moveNextW[] = {'m','o','v','e','N','e','x','t',0}; +static inline EnumeratorInstance *enumerator_from_jsdisp(jsdisp_t *jsdisp) +{ + return CONTAINING_RECORD(jsdisp, EnumeratorInstance, dispex); +} + +static inline EnumeratorInstance *enumerator_from_vdisp(vdisp_t *vdisp) +{ + return enumerator_from_jsdisp(vdisp->u.jsdisp); +} + +static inline EnumeratorInstance *enumerator_this(vdisp_t *jsthis) +{ + return is_vclass(jsthis, JSCLASS_ENUMERATOR) ? enumerator_from_vdisp(jsthis) : NULL; +} + +static inline HRESULT enumvar_get_next_item(EnumeratorInstance *This) +{ + HRESULT hres; + VARIANT nextitem; + + if (This->atend) + return S_OK; + + /* dont leak pervious value */ + jsval_release(This->item); + + /* not at end ... get next item */ + VariantInit(&nextitem); + hres = IEnumVARIANT_Next(This->enumvar, 1, &nextitem, NULL); + if (hres == S_OK) + { + hres = variant_to_jsval(&nextitem, &This->item); + if (FAILED(hres)) + { + WARN("failed to convert jsval to variant!"); + This->item = jsval_undefined(); + } + } + else + { + This->item = jsval_undefined(); + This->atend = TRUE; + } + VariantClear(&nextitem); + + return S_OK; +} + static void Enumerator_destructor(jsdisp_t *dispex) { - TRACE("Enumerator_destructor\n"); + EnumeratorInstance *This = enumerator_from_jsdisp(dispex); + + TRACE("\n"); + jsval_release(This->item); heap_free(dispex); } static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_atEnd\n"); + EnumeratorInstance *This; - return E_NOTIMPL; + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (r) + *r = jsval_bool(This->atend); + + TRACE("%d\n", This->atend); + + return S_OK; } static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_item\n"); + EnumeratorInstance *This; + + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); - return E_NOTIMPL; + return r ? jsval_copy(This->item, r) : S_OK; } static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveFirst\n"); + EnumeratorInstance *This; + HRESULT hres = S_OK; - return E_NOTIMPL; + TRACE("\n"); + + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + { + This->atend = FALSE; + hres = IEnumVARIANT_Reset(This->enumvar); + if (!FAILED(hres)) + hres = enumvar_get_next_item(This); + } + + if (r) + *r = jsval_undefined(); + + return hres; } static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { - TRACE("Enumerator_moveNext\n"); + EnumeratorInstance *This; + HRESULT hres = S_OK; + + TRACE("\n"); - return E_NOTIMPL; + if (!(This = enumerator_this(jsthis))) + return throw_type_error(ctx, JS_E_ENUMERATOR_EXPECTED, NULL); + + if (This->enumvar) + hres = enumvar_get_next_item(This); + + if (r) + *r = jsval_undefined(); + + return hres; } static const builtin_prop_t Enumerator_props[] = { @@ -80,7 +178,7 @@ static const builtin_prop_t Enumerator_props[] = { }; static const builtin_info_t Enumerator_info = { - JSCLASS_OBJECT, + JSCLASS_ENUMERATOR, {NULL, NULL, 0}, ARRAY_SIZE(Enumerator_props), Enumerator_props, @@ -89,7 +187,7 @@ static const builtin_info_t Enumerator_info = { }; static const builtin_info_t EnumeratorInst_info = { - JSCLASS_OBJECT, + JSCLASS_ENUMERATOR, {NULL, NULL, 0, NULL}, 0, NULL, @@ -101,16 +199,18 @@ static HRESULT EnumeratorConstr_value(script_ctx_t *ctx, vdisp_t *vthis, WORD fl jsval_t *r) { jsdisp_t *obj; + jsval_t *arg0; HRESULT hres; - TRACE("EnumeratorConstr_value\n"); + TRACE("\n"); switch(flags) { case DISPATCH_CONSTRUCT: { - if (argc != 1) - return throw_syntax_error(ctx, JS_E_MISSING_ARG, NULL); + if (argc > 1) + return throw_syntax_error(ctx, JS_E_INVALIDARG, NULL); - hres = create_enumerator(ctx, &argv[0], &obj); + arg0 = (argc == 1) ? &argv[0] : 0; + hres = create_enumerator(ctx, arg0, &obj); if(FAILED(hres)) return hres; @@ -140,7 +240,8 @@ static HRESULT alloc_enumerator(script_ctx_t *ctx, jsdisp_t *object_prototype, E hres = init_dispex_from_constr(&enumerator->dispex, ctx, &EnumeratorInst_info, ctx->enumerator_constr); - if(FAILED(hres)) { + if(FAILED(hres)) + { heap_free(enumerator); return hres; } @@ -180,11 +281,83 @@ HRESULT create_enumerator(script_ctx_t *ctx, jsval_t *argv, jsdisp_t **ret) { EnumeratorInstance *enumerator; HRESULT hres; + IDispatch *obj; + DISPPARAMS dispparams = {NULL, NULL, 0, 0}; + VARIANT varresult; + BOOL atend; + + IEnumVARIANT *enumvar; + + memset(&varresult, 0, sizeof(VARIANT)); + VariantInit(&varresult); + + /* new Enumerator() */ + if (argv == NULL) + { + enumvar = NULL; + atend = TRUE; + } + else if (is_object_instance(*argv)) + { + obj = get_object(*argv); + + /* Try to get a IEnumVARIANT by _NewEnum */ + hres = IDispatch_Invoke(obj, + DISPID_NEWENUM, &IID_NULL, LOCALE_NEUTRAL, + DISPATCH_METHOD, &dispparams, &varresult, + NULL, NULL); + if (FAILED(hres)) + { + WARN("Enumerator: no DISPID_NEWENUM.\n"); + hres = E_INVALIDARG; + goto cleanuperr; + } + + if ((V_VT(&varresult) == VT_DISPATCH) || + (V_VT(&varresult) == VT_UNKNOWN)) + { + hres = IUnknown_QueryInterface(V_UNKNOWN(&varresult), + &IID_IEnumVARIANT, (void**)&enumvar); + if (FAILED(hres)) + { + hres = E_INVALIDARG; + goto cleanuperr; + } + } + else + { + FIXME("Enumerator: NewEnum unexpected type of varresult (%d).\n", V_VT(&varresult)); + hres = E_INVALIDARG; + goto cleanuperr; + } + VariantClear(&varresult); + + atend = FALSE; + } + else + { + FIXME("I don't know how to handle this type!\n"); + hres = E_NOTIMPL; + goto cleanuperr; + } hres = alloc_enumerator(ctx, NULL, &enumerator); if(FAILED(hres)) - return hres; + goto cleanuperr; + + enumerator->atend = atend; + enumerator->enumvar = enumvar; + + hres = enumvar_get_next_item(enumerator); + if (FAILED(hres)) + goto cleanuperr; *ret = &enumerator->dispex; + return S_OK; +cleanuperr: + VariantClear(&varresult); + if (enumerator) + heap_free(enumerator); + return hres; } diff --git a/dlls/jscript/jscript.h b/dlls/jscript/jscript.h index baebcc4b6c..879b2b837b 100644 --- a/dlls/jscript/jscript.h +++ b/dlls/jscript/jscript.h @@ -116,6 +116,7 @@ typedef enum { JSCLASS_ARRAY, JSCLASS_BOOLEAN, JSCLASS_DATE, + JSCLASS_ENUMERATOR, JSCLASS_ERROR, JSCLASS_FUNCTION, JSCLASS_GLOBAL, @@ -561,6 +562,7 @@ static inline DWORD make_grfdex(script_ctx_t *ctx, DWORD flags) #define JS_E_VBARRAY_EXPECTED MAKE_JSERROR(IDS_NOT_VBARRAY) #define JS_E_INVALID_DELETE MAKE_JSERROR(IDS_INVALID_DELETE) #define JS_E_JSCRIPT_EXPECTED MAKE_JSERROR(IDS_JSCRIPT_EXPECTED) +#define JS_E_ENUMERATOR_EXPECTED MAKE_JSERROR(IDS_NOT_ENUMERATOR) #define JS_E_REGEXP_SYNTAX MAKE_JSERROR(IDS_REGEXP_SYNTAX_ERROR) #define JS_E_INVALID_URI_CODING MAKE_JSERROR(IDS_URI_INVALID_CODING) #define JS_E_INVALID_URI_CHAR MAKE_JSERROR(IDS_URI_INVALID_CHAR) diff --git a/dlls/jscript/object.c b/dlls/jscript/object.c index 19d67b514f..3fa93c7d66 100644 --- a/dlls/jscript/object.c +++ b/dlls/jscript/object.c @@ -69,7 +69,7 @@ static HRESULT Object_toString(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, u static const WCHAR regexpW[] = {'R','e','g','E','x','p',0}; static const WCHAR stringW[] = {'S','t','r','i','n','g',0}; /* Keep in sync with jsclass_t enum */ - static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, errorW, + static const WCHAR *names[] = {NULL, arrayW, booleanW, dateW, objectW, errorW, functionW, NULL, mathW, numberW, objectW, regexpW, stringW, objectW, objectW, objectW}; TRACE("\n"); diff --git a/dlls/jscript/resource.h b/dlls/jscript/resource.h index d15dd7a033..d171ce20f8 100644 --- a/dlls/jscript/resource.h +++ b/dlls/jscript/resource.h @@ -56,6 +56,7 @@ #define IDS_INVALID_DELETE 0x1394 #define IDS_NOT_VBARRAY 0x1395 #define IDS_JSCRIPT_EXPECTED 0x1396 +#define IDS_NOT_ENUMERATOR 0x1397 #define IDS_REGEXP_SYNTAX_ERROR 0x1399 #define IDS_URI_INVALID_CHAR 0x13A0 #define IDS_URI_INVALID_CODING 0x13A1 -- 2.11.0

2 2