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

[PATCH] server: Rename cpu_type_t to client_cpu_t.

by Jacek Caban

To avoid conflicts with mac headers. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/process.c | 2 +- dlls/ntdll/process.c | 2 +- server/protocol.def | 14 +++++++------- server/trace.c | 14 +++++++------- 4 files changed, 16 insertions(+), 16 deletions(-)

July 5, 2019

[PATCH 5/5] wined3d: Merge wined3d_texture_download_data() and wined3d_texture_gl_download_data().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/texture.c | 174 ++++++++++++++++++++--------------------- dlls/wined3d/wined3d_private.h | 2 - 2 files changed, 87 insertions(+), 89 deletions(-) diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index 88db24927d1..6ae822ddf28 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -2372,62 +2372,116 @@ static void texture_download_data_slow_path(struct wined3d_texture *texture, uns heap_free(temporary_mem); } -/* This call just downloads data, the caller is responsible for binding the - * correct texture. Partial downloads are not supported. */ -/* Context activation is done by the caller. */ -void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_bo_address *data) +static void wined3d_texture_gl_download_data(struct wined3d_context *context, + struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, + const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, + const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, + unsigned int dst_row_pitch, unsigned int dst_slice_pitch) { + struct wined3d_texture_gl *src_texture_gl = wined3d_texture_gl(src_texture); + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int src_level, src_width, src_height, src_depth; + unsigned int src_row_pitch, src_slice_pitch; const struct wined3d_format_gl *format_gl; - unsigned int level; + BOOL srgb = FALSE; GLenum target; - format_gl = wined3d_format_gl(texture->resource.format); - target = wined3d_texture_gl_get_sub_resource_target(wined3d_texture_gl(texture), sub_resource_idx); - level = sub_resource_idx % texture->level_count; + TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " + "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", + context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), + debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), + dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); + + if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) + { + srgb = TRUE; + } + else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) + { + FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); + return; + } + + src_level = src_sub_resource_idx % src_texture->level_count; + src_width = wined3d_texture_get_level_width(src_texture, src_level); + src_height = wined3d_texture_get_level_height(src_texture, src_level); + src_depth = wined3d_texture_get_level_depth(src_texture, src_level); + if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height + || src_box->front || src_box->back != src_depth) + { + FIXME("Unhandled source box %s.\n", debug_box(src_box)); + return; + } - if ((texture->resource.type == WINED3D_RTYPE_TEXTURE_2D + if (dst_x || dst_y || dst_z) + { + FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); + return; + } + + if (dst_format->id != src_texture->resource.format->id) + { + FIXME("Unhandled format conversion (%s -> %s).\n", + debug_d3dformat(src_texture->resource.format->id), + debug_d3dformat(dst_format->id)); + return; + } + + wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); + if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) + { + FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", + dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); + return; + } + + wined3d_texture_gl_bind_and_dirtify(src_texture_gl, context_gl, srgb); + + format_gl = wined3d_format_gl(src_texture->resource.format); + target = wined3d_texture_gl_get_sub_resource_target(src_texture_gl, src_sub_resource_idx); + + if ((src_texture->resource.type == WINED3D_RTYPE_TEXTURE_2D && (target == GL_TEXTURE_2D_ARRAY || format_gl->f.conv_byte_count - || texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED))) + || src_texture->flags & (WINED3D_TEXTURE_CONVERTED | WINED3D_TEXTURE_COND_NP2_EMULATED))) || target == GL_TEXTURE_1D_ARRAY) { - texture_download_data_slow_path(texture, sub_resource_idx, context, data); + texture_download_data_slow_path(src_texture, src_sub_resource_idx, context, dst_bo_addr); return; } if (format_gl->f.conv_byte_count) { FIXME("Attempting to download a converted texture, type %s format %s.\n", - debug_d3dresourcetype(texture->resource.type), + debug_d3dresourcetype(src_texture->resource.type), debug_d3dformat(format_gl->f.id)); return; } - if (data->buffer_object) + if (dst_bo_addr->buffer_object) { - GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, data->buffer_object)); + GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, dst_bo_addr->buffer_object)); checkGLcall("glBindBuffer"); } - if (texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) + if (src_texture->resource.format_flags & WINED3DFMT_FLAG_COMPRESSED) { TRACE("Downloading compressed texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, data->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); - GL_EXTCALL(glGetCompressedTexImage(target, level, data->addr)); + GL_EXTCALL(glGetCompressedTexImage(target, src_level, dst_bo_addr->addr)); checkGLcall("glGetCompressedTexImage"); } else { TRACE("Downloading texture %p, %u, level %u, format %#x, type %#x, data %p.\n", - texture, sub_resource_idx, level, format_gl->format, format_gl->type, data->addr); + src_texture, src_sub_resource_idx, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); - gl_info->gl_ops.gl.p_glGetTexImage(target, level, format_gl->format, format_gl->type, data->addr); + gl_info->gl_ops.gl.p_glGetTexImage(target, src_level, format_gl->format, format_gl->type, dst_bo_addr->addr); checkGLcall("glGetTexImage"); } - if (data->buffer_object) + if (dst_bo_addr->buffer_object) { GL_EXTCALL(glBindBuffer(GL_PIXEL_PACK_BUFFER, 0)); checkGLcall("glBindBuffer"); @@ -2458,11 +2512,20 @@ static BOOL wined3d_texture_gl_load_sysmem(struct wined3d_texture_gl *texture_gl /* Download the sub-resource to system memory. */ if (sub_resource->locations & (WINED3D_LOCATION_TEXTURE_RGB | WINED3D_LOCATION_TEXTURE_SRGB)) { + unsigned int row_pitch, slice_pitch, level; struct wined3d_bo_address data; - wined3d_texture_gl_bind_and_dirtify(texture_gl, context_gl, - !(sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB)); + struct wined3d_box src_box; + unsigned int src_location; + + level = sub_resource_idx % texture_gl->t.level_count; wined3d_texture_get_memory(&texture_gl->t, sub_resource_idx, &data, dst_location); - wined3d_texture_download_data(&texture_gl->t, sub_resource_idx, &context_gl->c, &data); + src_location = sub_resource->locations & WINED3D_LOCATION_TEXTURE_RGB + ? WINED3D_LOCATION_TEXTURE_RGB : WINED3D_LOCATION_TEXTURE_SRGB; + wined3d_texture_get_level_box(&texture_gl->t, level, &src_box); + wined3d_texture_get_pitch(&texture_gl->t, level, &row_pitch, &slice_pitch); + wined3d_texture_gl_download_data(&context_gl->c, &texture_gl->t, sub_resource_idx, src_location, + &src_box, &data, texture_gl->t.resource.format, 0, 0, 0, row_pitch, slice_pitch); + ++texture_gl->t.download_count; return TRUE; } @@ -2783,69 +2846,6 @@ static void wined3d_texture_gl_upload_data(struct wined3d_context *context, src_box, src_bo_addr, src_row_pitch, src_slice_pitch, dst_x, dst_y, dst_z, srgb); } -static void wined3d_texture_gl_download_data(struct wined3d_context *context, - struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx, unsigned int src_location, - const struct wined3d_box *src_box, const struct wined3d_bo_address *dst_bo_addr, - const struct wined3d_format *dst_format, unsigned int dst_x, unsigned int dst_y, unsigned int dst_z, - unsigned int dst_row_pitch, unsigned int dst_slice_pitch) -{ - unsigned int src_level, src_width, src_height, src_depth; - unsigned int src_row_pitch, src_slice_pitch; - BOOL srgb = FALSE; - - TRACE("context %p, src_texture %p, src_sub_resource_idx %u, src_location %s, src_box %s, dst_bo_addr %s, " - "dst_format %s, dst_x %u, dst_y %u, dst_z %u, dst_row_pitch %u, dst_slice_pitch %u.\n", - context, src_texture, src_sub_resource_idx, wined3d_debug_location(src_location), - debug_box(src_box), debug_bo_address(dst_bo_addr), debug_d3dformat(dst_format->id), - dst_x, dst_y, dst_z, dst_row_pitch, dst_slice_pitch); - - if (src_location == WINED3D_LOCATION_TEXTURE_SRGB) - { - srgb = TRUE; - } - else if (src_location != WINED3D_LOCATION_TEXTURE_RGB) - { - FIXME("Unhandled location %s.\n", wined3d_debug_location(src_location)); - return; - } - - src_level = src_sub_resource_idx % src_texture->level_count; - src_width = wined3d_texture_get_level_width(src_texture, src_level); - src_height = wined3d_texture_get_level_height(src_texture, src_level); - src_depth = wined3d_texture_get_level_depth(src_texture, src_level); - if (src_box->left || src_box->top || src_box->right != src_width || src_box->bottom != src_height - || src_box->front || src_box->back != src_depth) - { - FIXME("Unhandled source box %s.\n", debug_box(src_box)); - return; - } - - if (dst_x || dst_y || dst_z) - { - FIXME("Unhandled destination (%u, %u, %u).\n", dst_x, dst_y, dst_z); - return; - } - - if (dst_format->id != src_texture->resource.format->id) - { - FIXME("Unhandled format conversion (%s -> %s).\n", - debug_d3dformat(src_texture->resource.format->id), - debug_d3dformat(dst_format->id)); - return; - } - - wined3d_texture_get_pitch(src_texture, src_level, &src_row_pitch, &src_slice_pitch); - if (src_row_pitch != dst_row_pitch || src_slice_pitch != dst_slice_pitch) - { - FIXME("Unhandled destination pitches %u/%u (source pitches %u/%u).\n", - dst_row_pitch, dst_slice_pitch, src_row_pitch, src_slice_pitch); - return; - } - - wined3d_texture_gl_bind_and_dirtify(wined3d_texture_gl(src_texture), wined3d_context_gl(context), srgb); - wined3d_texture_download_data(src_texture, src_sub_resource_idx, context, dst_bo_addr); -} - static const struct wined3d_texture_ops texture_gl_ops = { wined3d_texture_gl_load_location, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index b6f4b670182..d6d98324c74 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3556,8 +3556,6 @@ void texture2d_read_from_framebuffer(struct wined3d_texture *texture, unsigned i HRESULT wined3d_texture_check_box_dimensions(const struct wined3d_texture *texture, unsigned int level, const struct wined3d_box *box) DECLSPEC_HIDDEN; -void wined3d_texture_download_data(struct wined3d_texture *texture, unsigned int sub_resource_idx, - struct wined3d_context *context, const struct wined3d_bo_address *data) DECLSPEC_HIDDEN; void wined3d_texture_download_from_texture(struct wined3d_texture *dst_texture, unsigned int dst_sub_resource_idx, struct wined3d_texture *src_texture, unsigned int src_sub_resource_idx) DECLSPEC_HIDDEN; GLenum wined3d_texture_get_gl_buffer(const struct wined3d_texture *texture) DECLSPEC_HIDDEN; -- 2.11.0

July 5, 2019

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to wined3d_pipeline_statistics_query_end().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 08f2e821251..d6f78797177 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -956,9 +956,9 @@ static BOOL wined3d_pipeline_query_ops_poll(struct wined3d_query *query, DWORD f } static void wined3d_pipeline_statistics_query_end(struct wined3d_pipeline_statistics_query *query, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_VERTICES_SUBMITTED_ARB)); GL_EXTCALL(glEndQuery(GL_PRIMITIVES_SUBMITTED_ARB)); @@ -990,7 +990,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); } else { @@ -1031,7 +1031,7 @@ static BOOL wined3d_pipeline_query_ops_issue(struct wined3d_query *query, DWORD { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_pipeline_statistics_query_end(pq, &context_gl->c); + wined3d_pipeline_statistics_query_end(pq, context_gl); context_release(&context_gl->c); poll = TRUE; } -- 2.11.0

July 5, 2019

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to wined3d_so_statistics_query_end().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 5d240110c25..08f2e821251 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -817,9 +817,9 @@ static BOOL wined3d_so_statistics_query_ops_poll(struct wined3d_query *query, DW } static void wined3d_so_statistics_query_end(struct wined3d_so_statistics_query *query, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; if (gl_info->supported[ARB_TRANSFORM_FEEDBACK3]) { @@ -850,7 +850,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, &context_gl->c); + wined3d_so_statistics_query_end(pq, context_gl); } else { @@ -894,7 +894,7 @@ static BOOL wined3d_so_statistics_query_ops_issue(struct wined3d_query *query, D { if ((context_gl = wined3d_context_gl_reacquire(pq->context_gl))) { - wined3d_so_statistics_query_end(pq, &context_gl->c); + wined3d_so_statistics_query_end(pq, context_gl); context_release(&context_gl->c); poll = TRUE; -- 2.11.0

July 5, 2019

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to wined3d_query_buffer_queue_result().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index 10ca7d63d3b..5d240110c25 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -73,16 +73,16 @@ static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *conte * object allows us to avoid these implicit flushes. An additional benefit is * that it allows us to poll the query status from the application-thread * instead of from the csmt-thread. */ -static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, struct wined3d_query *query, GLuint id) +static BOOL wined3d_query_buffer_queue_result(struct wined3d_context_gl *context_gl, + struct wined3d_query *query, GLuint id) { - 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; GLsync tmp_sync; if (!gl_info->supported[ARB_QUERY_BUFFER_OBJECT] || !gl_info->supported[ARB_BUFFER_STORAGE]) return FALSE; /* Don't use query buffers without CSMT, mainly for simplicity. */ - if (!context->device->cs->thread) + if (!context_gl->c.device->cs->thread) return FALSE; if (query->buffer_object) @@ -684,7 +684,7 @@ static BOOL wined3d_occlusion_query_ops_issue(struct wined3d_query *query, DWORD gl_info = context_gl->c.gl_info; GL_EXTCALL(glEndQuery(GL_SAMPLES_PASSED)); checkGLcall("glEndQuery()"); - wined3d_query_buffer_queue_result(&context_gl->c, query, oq->id); + wined3d_query_buffer_queue_result(context_gl, query, oq->id); context_release(&context_gl->c); poll = TRUE; -- 2.11.0

July 5, 2019

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to wined3d_query_destroy_buffer_object().

by Henri Verbeet

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/query.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dlls/wined3d/query.c b/dlls/wined3d/query.c index b1677375a90..10ca7d63d3b 100644 --- a/dlls/wined3d/query.c +++ b/dlls/wined3d/query.c @@ -54,9 +54,9 @@ static void wined3d_query_create_buffer_object(struct wined3d_context_gl *contex query->buffer_object = buffer_object; } -static void wined3d_query_destroy_buffer_object(struct wined3d_context *context, struct wined3d_query *query) +static void wined3d_query_destroy_buffer_object(struct wined3d_context_gl *context_gl, struct wined3d_query *query) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; GL_EXTCALL(glDeleteBuffers(1, &query->buffer_object)); checkGLcall("query buffer object destruction"); @@ -93,7 +93,7 @@ static BOOL wined3d_query_buffer_queue_result(struct wined3d_context *context, s if (wined3d_query_buffer_is_valid(query)) wined3d_query_buffer_invalidate(query); else - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(context_gl, query); } if (!query->buffer_object) @@ -434,8 +434,9 @@ static void wined3d_query_destroy_object(void *object) if (query->buffer_object) { struct wined3d_context *context; + context = context_acquire(query->device, NULL, 0); - wined3d_query_destroy_buffer_object(context, query); + wined3d_query_destroy_buffer_object(wined3d_context_gl(context), query); context_release(context); } -- 2.11.0

July 5, 2019

[PATCH 5/5] server: Remove no longer needed break_process.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/process.c | 22 ---------------------- server/process.h | 1 - server/thread.c | 35 ----------------------------------- server/thread.h | 2 -- 4 files changed, 60 deletions(-)

July 5, 2019

[PATCH 4/5] kernel32: Use DebugBreakProcess in DebugActiveProcess.

by Jacek Caban

Fixes attaching to a process with VS remote debugger. It expects the first break exception address to be DbgBreakPoint. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/debugger.c | 6 ++++++ dlls/kernel32/tests/debugger.c | 2 -- server/debugger.c | 1 - 3 files changed, 6 insertions(+), 3 deletions(-)

July 5, 2019

[PATCH 3/5] winternl.h: Remove inline DbgBreakPoint version.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- If we really need an inline version, I'd suggest to provide a compatibility version of__debugbreak() instead. dlls/kernel32/tests/debugger.c | 1 - include/winternl.h | 9 ++------- 2 files changed, 2 insertions(+), 8 deletions(-)

July 5, 2019

[PATCH 2/5] kernel32: Reimplement DebugBreakProcess on top of DbgUiIssueRemoteBreakin.

by Jacek Caban

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/kernel32/debugger.c | 18 ++++++------------ dlls/kernel32/tests/debugger.c | 3 +-- server/debugger.c | 14 -------------- server/protocol.def | 8 -------- 4 files changed, 7 insertions(+), 36 deletions(-)

July 5, 2019