From: Masanori Kakura Subject: [v6 PATCH 1/3] wined3d: Send texture updates through the command stream. Message-Id: <20170528141047.24496-1-kakurasan@gmail.com> Date: Sun, 28 May 2017 23:10:45 +0900 v6 - Don't use wined3d_cs_emit_blt_sub_resource() in wined3d_cs_exec_update_texture() - Add TRACE()s Signed-off-by: Masanori Kakura --- dlls/wined3d/cs.c | 150 +++++++++++++++++++++++++++++++++++++++++ dlls/wined3d/device.c | 22 +----- dlls/wined3d/wined3d_private.h | 5 ++ 3 files changed, 158 insertions(+), 19 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 1e1d69e11a..d86657e2f2 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -68,6 +68,7 @@ enum wined3d_cs_op WINED3D_CS_OP_UNMAP, WINED3D_CS_OP_BLT_SUB_RESOURCE, WINED3D_CS_OP_UPDATE_SUB_RESOURCE, + WINED3D_CS_OP_UPDATE_TEXTURE, WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION, WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW, WINED3D_CS_OP_STOP, @@ -404,6 +405,18 @@ struct wined3d_cs_update_sub_resource struct wined3d_sub_resource_data data; }; +struct wined3d_cs_update_texture +{ + enum wined3d_cs_op opcode; + struct wined3d_texture *src_texture; + struct wined3d_texture *dst_texture; + unsigned int level_count; + unsigned int layer_count; + unsigned int src_level_count; + unsigned int dst_level_count; + unsigned int src_skip_levels; +}; + struct wined3d_cs_add_dirty_texture_region { enum wined3d_cs_op opcode; @@ -2163,6 +2176,142 @@ void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_r cs->ops->finish(cs, WINED3D_CS_QUEUE_DEFAULT); } +static void wined3d_cs_exec_update_texture(struct wined3d_cs *cs, const void *data) +{ + const struct wined3d_cs_update_texture *op = data; + struct wined3d_texture *src_texture = op->src_texture; + struct wined3d_texture *dst_texture = op->dst_texture; + unsigned int level_count = op->level_count; + unsigned int layer_count = op->layer_count; + unsigned int src_level_count = op->src_level_count; + unsigned int dst_level_count = op->dst_level_count; + unsigned int src_skip_levels = op->src_skip_levels; + unsigned int i, j; + unsigned int width, height, depth; + + /* 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); + + for (j = 0; j < layer_count; ++j) + { + struct wined3d_resource *dst_resource = &dst_texture->resource; + unsigned int dst_sub_resource_idx = j * dst_level_count + i; + unsigned int src_sub_resource_idx = j * src_level_count + i + src_skip_levels; + + if (dst_resource->type == WINED3D_RTYPE_TEXTURE_2D) + { + RECT rect; + struct wined3d_surface *dst_surface, *src_surface; + + dst_surface = dst_texture->sub_resources[dst_sub_resource_idx].u.surface; + src_surface = src_texture->sub_resources[src_sub_resource_idx].u.surface; + SetRect(&rect, 0, 0, width, height); + + TRACE("src_texture %p, dst_texture %p, level %u, layer %u, " + "src_sub_resource_idx %u, dst_sub_resource_idx %u, rect %s.\n", + src_texture, dst_texture, i, j, + src_sub_resource_idx, dst_sub_resource_idx, wine_dbgstr_rect(&rect)); + + if (FAILED(wined3d_surface_blt(dst_surface, &rect, src_surface, + &rect, 0, NULL, WINED3D_TEXF_POINT))) + FIXME("Blit failed.\n"); + } + else if (dst_resource->type == WINED3D_RTYPE_TEXTURE_3D) + { + struct wined3d_box box; + unsigned int row_pitch, slice_pitch; + struct wined3d_context *context; + struct wined3d_bo_address addr; + + wined3d_box_set(&box, 0, 0, width, height, 0, depth); + + TRACE("src_texture %p, dst_texture %p, level %u, layer %u, " + "src_sub_resource_idx %u, dst_sub_resource_idx %u, box %s.\n", + src_texture, dst_texture, i, j, + src_sub_resource_idx, dst_sub_resource_idx, debug_box(&box)); + + if (box.left || box.top || box.front) + { + FIXME("Source box %s not supported for %s resources.\n", + debug_box(&box), debug_d3dresourcetype(dst_resource->type)); + continue; + } + + context = context_acquire(cs->device, NULL, 0); + + if (!wined3d_texture_load_location(src_texture, src_sub_resource_idx, + context, src_texture->resource.map_binding)) + { + ERR("Failed to load source sub-resource into %s.\n", + wined3d_debug_location(src_texture->resource.map_binding)); + goto release_context; + } + + if (box.right - box.left == width + && box.bottom - box.top == height + && box.back - box.front == depth) + { + wined3d_texture_prepare_texture(dst_texture, context, FALSE); + } + else if (!wined3d_texture_load_location(dst_texture, dst_sub_resource_idx, + context, WINED3D_LOCATION_TEXTURE_RGB)) + { + ERR("Failed to load destination sub-resource.\n"); + goto release_context; + } + + wined3d_texture_get_memory(src_texture, src_sub_resource_idx, &addr, src_texture->resource.map_binding); + wined3d_texture_get_pitch(src_texture, src_sub_resource_idx % src_texture->level_count, + &row_pitch, &slice_pitch); + + wined3d_texture_bind_and_dirtify(dst_texture, context, FALSE); + wined3d_texture_upload_data(dst_texture, dst_sub_resource_idx, context, &box, + wined3d_const_bo_address(&addr), row_pitch, slice_pitch); + wined3d_texture_validate_location(dst_texture, dst_sub_resource_idx, WINED3D_LOCATION_TEXTURE_RGB); + wined3d_texture_invalidate_location(dst_texture, dst_sub_resource_idx, ~WINED3D_LOCATION_TEXTURE_RGB); + + release_context: + context_release(context); + } + else + { + FIXME("Not implemented for %s resources.\n", debug_d3dresourcetype(dst_resource->type)); + } + } + } + + wined3d_resource_release(&src_texture->resource); + wined3d_resource_release(&dst_texture->resource); +} + +void wined3d_cs_emit_update_texture(struct wined3d_cs *cs, + struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture, + unsigned int level_count, unsigned int layer_count, + unsigned int src_level_count, unsigned int dst_level_count, + unsigned int src_skip_levels) +{ + struct wined3d_cs_update_texture *op; + + op = cs->ops->require_space(cs, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op->opcode = WINED3D_CS_OP_UPDATE_TEXTURE; + op->src_texture = src_texture; + op->dst_texture = dst_texture; + op->level_count = level_count; + op->layer_count = layer_count; + op->src_level_count = src_level_count; + op->dst_level_count = dst_level_count; + op->src_skip_levels = src_skip_levels; + + wined3d_resource_acquire(&src_texture->resource); + wined3d_resource_acquire(&dst_texture->resource); + + cs->ops->submit(cs, WINED3D_CS_QUEUE_DEFAULT); +} + static void wined3d_cs_exec_add_dirty_texture_region(struct wined3d_cs *cs, const void *data) { const struct wined3d_cs_add_dirty_texture_region *op = data; @@ -2282,6 +2431,7 @@ static void (* const wined3d_cs_op_handlers[])(struct wined3d_cs *cs, const void /* WINED3D_CS_OP_UNMAP */ wined3d_cs_exec_unmap, /* WINED3D_CS_OP_BLT_SUB_RESOURCE */ wined3d_cs_exec_blt_sub_resource, /* WINED3D_CS_OP_UPDATE_SUB_RESOURCE */ wined3d_cs_exec_update_sub_resource, + /* WINED3D_CS_OP_UPDATE_TEXTURE */ wined3d_cs_exec_update_texture, /* WINED3D_CS_OP_ADD_DIRTY_TEXTURE_REGION */ wined3d_cs_exec_add_dirty_texture_region, /* WINED3D_CS_OP_CLEAR_UNORDERED_ACCESS_VIEW */ wined3d_cs_exec_clear_unordered_access_view, }; diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e07d07c41e..42ddbb389b 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -3718,10 +3718,8 @@ 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; + unsigned int layer_count, level_count; enum wined3d_resource_type type; - struct wined3d_box box; TRACE("device %p, src_texture %p, dst_texture %p.\n", device, src_texture, dst_texture); @@ -3789,22 +3787,8 @@ HRESULT CDECL wined3d_device_update_texture(struct wined3d_device *device, return WINED3DERR_INVALIDCALL; } - /* 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); - - for (j = 0; j < layer_count; ++j) - { - wined3d_cs_emit_blt_sub_resource(device->cs, - &dst_texture->resource, j * dst_level_count + i, &box, - &src_texture->resource, j * src_level_count + i + src_skip_levels, &box, - 0, NULL, WINED3D_TEXF_POINT); - } - } + wined3d_cs_emit_update_texture(device->cs, src_texture, dst_texture, + level_count, layer_count, src_level_count, dst_level_count, src_skip_levels); return WINED3D_OK; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 6139c677c7..b4f4e8bafb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3439,6 +3439,11 @@ void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resou void wined3d_cs_emit_update_sub_resource(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, const struct wined3d_box *box, const void *data, unsigned int row_pitch, unsigned int slice_pitch) DECLSPEC_HIDDEN; +void wined3d_cs_emit_update_texture(struct wined3d_cs *cs, + struct wined3d_texture *src_texture, struct wined3d_texture *dst_texture, + unsigned int level_count, unsigned int layer_count, + unsigned int src_level_count, unsigned int dst_level_count, + unsigned int src_skip_levels) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; HRESULT wined3d_cs_map(struct wined3d_cs *cs, struct wined3d_resource *resource, unsigned int sub_resource_idx, -- 2.11.0