June 2019 - Wine-devel - list.winehq.org

[PATCH 4/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_ffp_vertex_normalmatrix_uniform().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index e0220d108c0..80e58ccb72b 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1308,18 +1308,18 @@ static void transpose_matrix(struct wined3d_matrix *out, const struct wined3d_ma *out = temp; } -static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context *context, +static void shader_glsl_ffp_vertex_normalmatrix_uniform(const struct wined3d_context_gl *context_gl, const struct wined3d_state *state, struct glsl_shader_prog_link *prog) { - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_matrix mv; float mat[3 * 3]; if (prog->vs.normal_matrix_location == -1) return; - get_modelview_matrix(context, state, 0, &mv); - compute_normal_matrix(mat, context->d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); + get_modelview_matrix(&context_gl->c, state, 0, &mv); + compute_normal_matrix(mat, context_gl->c.d3d_info->wined3d_creation_flags & WINED3D_LEGACY_FFP_LIGHTING, &mv); GL_EXTCALL(glUniformMatrix3fv(prog->vs.normal_matrix_location, 1, FALSE, mat)); checkGLcall("glUniformMatrix3fv"); @@ -1516,6 +1516,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context const struct wined3d_shader *vshader = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_shader *pshader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct glsl_context_data *ctx_data = context->shader_backend_data; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); struct glsl_shader_prog_link *prog = ctx_data->glsl_program; const struct wined3d_gl_info *gl_info = context->gl_info; float position_fixup[4 * WINED3D_MAX_VIEWPORTS]; @@ -1580,7 +1581,7 @@ static void shader_glsl_load_constants(void *shader_priv, struct wined3d_context GL_EXTCALL(glUniformMatrix4fv(prog->vs.modelview_matrix_location[0], 1, FALSE, &mat._11)); checkGLcall("glUniformMatrix4fv"); - shader_glsl_ffp_vertex_normalmatrix_uniform(context, state, prog); + shader_glsl_ffp_vertex_normalmatrix_uniform(context_gl, state, prog); } if (update_mask & WINED3D_SHADER_CONST_FFP_VERTEXBLEND) -- 2.11.0

1 0

[PATCH 3/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_init_transform_feedback().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 4b316562e2e..e0220d108c0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -938,11 +938,11 @@ static BOOL shader_glsl_generate_transform_feedback_varyings(struct wined3d_stri return have_varyings_to_record; } -static void shader_glsl_init_transform_feedback(const struct wined3d_context *context, +static void shader_glsl_init_transform_feedback(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, struct wined3d_shader *shader) { const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_string_buffer *buffer; unsigned int i, count, length; const char **varyings; @@ -10342,7 +10342,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const GL_EXTCALL(glAttachShader(program_id, gs_id)); checkGLcall("glAttachShader"); - shader_glsl_init_transform_feedback(context, priv, program_id, gshader); + shader_glsl_init_transform_feedback(context_gl, priv, program_id, gshader); list_add_head(&gshader->linked_programs, &entry->gs.shader_entry); } -- 2.11.0

1 0

[PATCH 2/5] wined3d: Pass a wined3d_context_gl structure to shader_glsl_load_program_resources().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/glsl_shader.c | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index c1f9d4cfe70..4b316562e2e 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -799,16 +799,16 @@ static void shader_glsl_load_images(const struct wined3d_gl_info *gl_info, struc } /* Context activation is done by the caller. */ -static void shader_glsl_load_program_resources(const struct wined3d_context *context, +static void shader_glsl_load_program_resources(const struct wined3d_context_gl *context_gl, struct shader_glsl_priv *priv, GLuint program_id, const struct wined3d_shader *shader) { const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; - shader_glsl_init_uniform_block_bindings(context->gl_info, priv, program_id, reg_maps); - shader_glsl_load_icb(context->gl_info, priv, program_id, reg_maps); + shader_glsl_init_uniform_block_bindings(context_gl->c.gl_info, priv, program_id, reg_maps); + shader_glsl_load_icb(context_gl->c.gl_info, priv, program_id, reg_maps); /* Texture unit mapping is set up to be the same each time the shader * program is used so we can hardcode the sampler uniform values. */ - shader_glsl_load_samplers(context, priv, program_id, reg_maps); + shader_glsl_load_samplers(&context_gl->c, priv, program_id, reg_maps); } static void append_transform_feedback_varying(const char **varyings, unsigned int *varying_count, @@ -9966,6 +9966,7 @@ static void shader_glsl_init_ps_uniform_locations(const struct wined3d_gl_info * static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, const struct wined3d_context *context, struct wined3d_shader *shader) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); struct glsl_context_data *ctx_data = context->shader_backend_data; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -10033,7 +10034,7 @@ static HRESULT shader_glsl_compile_compute_shader(struct shader_glsl_priv *priv, GL_EXTCALL(glUseProgram(program_id)); checkGLcall("glUseProgram"); - shader_glsl_load_program_resources(context, priv, program_id, shader); + shader_glsl_load_program_resources(context_gl, priv, program_id, shader); shader_glsl_load_images(gl_info, priv, program_id, &shader->reg_maps); entry->constant_update_mask = 0; @@ -10092,6 +10093,7 @@ static void set_glsl_compute_shader_program(const struct wined3d_context *contex static void set_glsl_shader_program(const struct wined3d_context *context, const struct wined3d_state *state, struct shader_glsl_priv *priv, struct glsl_context_data *ctx_data) { + const struct wined3d_context_gl *context_gl = wined3d_context_gl_const(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_gl_info *gl_info = context->gl_info; const struct wined3d_shader *pre_rasterization_shader; @@ -10414,7 +10416,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->vs.base_vertex_id_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_BASE_VERTEX_ID; - shader_glsl_load_program_resources(context, priv, program_id, vshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, vshader); } else { @@ -10452,14 +10454,14 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const entry->constant_update_mask |= WINED3D_SHADER_CONST_VS_POINTSIZE; if (hshader) - shader_glsl_load_program_resources(context, priv, program_id, hshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, hshader); if (dshader) { if (entry->ds.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, dshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, dshader); } if (gshader) @@ -10467,7 +10469,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->gs.pos_fixup_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_POS_FIXUP; - shader_glsl_load_program_resources(context, priv, program_id, gshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, gshader); } if (ps_id) @@ -10482,7 +10484,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const if (entry->ps.ycorrection_location != -1) entry->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; - shader_glsl_load_program_resources(context, priv, program_id, pshader); + shader_glsl_load_program_resources(context_gl, priv, program_id, pshader); shader_glsl_load_images(gl_info, priv, program_id, &pshader->reg_maps); } else -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_context_gl structure to wined3d_buffer_gl_destroy_buffer_object().
by Henri Verbeet 24 Jun '19

24 Jun '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/buffer.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 5aca952b2cf..2ed3984bea1 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -140,11 +140,10 @@ static void wined3d_buffer_gl_bind(struct wined3d_buffer_gl *buffer_gl, struct w /* Context activation is done by the caller. */ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *buffer_gl, - struct wined3d_context *context) + struct wined3d_context_gl *context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; struct wined3d_resource *resource = &buffer_gl->b.resource; - const struct wined3d_gl_info *gl_info = context->gl_info; if (!buffer_gl->buffer_object) return; @@ -172,7 +171,7 @@ static void wined3d_buffer_gl_destroy_buffer_object(struct wined3d_buffer_gl *bu if (resource->bind_flags & WINED3D_BIND_STREAM_OUTPUT) { device_invalidate_state(resource->device, STATE_STREAM_OUTPUT); - if (context->transform_feedback_active) + if (context_gl->c.transform_feedback_active) { /* We have to make sure that transform feedback is not active * when deleting a potentially bound transform feedback buffer. @@ -269,7 +268,7 @@ fail: /* Clean up all BO init, but continue because we can work without a BO :-) */ ERR("Failed to create a buffer object. Continuing, but performance issues may occur.\n"); buffer_gl->b.flags &= ~WINED3D_BUFFER_USE_BO; - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, &context_gl->c); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context_gl); buffer_clear_dirty_areas(&buffer_gl->b); return FALSE; } @@ -758,7 +757,7 @@ static void buffer_unload(struct wined3d_resource *resource) wined3d_buffer_load_location(buffer, context, WINED3D_LOCATION_SYSMEM); wined3d_buffer_invalidate_location(buffer, WINED3D_LOCATION_BUFFER); - wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), context); + wined3d_buffer_gl_destroy_buffer_object(wined3d_buffer_gl(buffer), wined3d_context_gl(context)); buffer_clear_dirty_areas(buffer); context_release(context); @@ -787,7 +786,7 @@ static void wined3d_buffer_gl_destroy_object(void *object) if (buffer_gl->buffer_object) { context = context_acquire(buffer_gl->b.resource.device, NULL, 0); - wined3d_buffer_gl_destroy_buffer_object(buffer_gl, context); + wined3d_buffer_gl_destroy_buffer_object(buffer_gl, wined3d_context_gl(context)); context_release(context); heap_free(buffer_gl->b.conversion_map); -- 2.11.0

1 0

[PATCH] tdi.sys: Fix EXTRADLLFLAGS.
by Jacek Caban 24 Jun '19

24 Jun '19

--- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

2 1

[PATCH] tdi.sys: Fix EXTRADLLFLAGS.
by Jacek Caban 24 Jun '19

24 Jun '19

--- dlls/tdi.sys/Makefile.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dlls/tdi.sys/Makefile.in b/dlls/tdi.sys/Makefile.in index 9d5e05f4a6..eef2fec7c3 100644 --- a/dlls/tdi.sys/Makefile.in +++ b/dlls/tdi.sys/Makefile.in @@ -1,7 +1,6 @@ MODULE = tdi.sys -EXTRADLLFLAGS = -Wl,--subsystem,native -EXTRADLLFLAGS = -mno-cygwin +EXTRADLLFLAGS = -mno-cygwin -Wl,--subsystem,native C_SRCS = \ main.c -- 2.21.0

1 0

Profiling application under Wine
by Chambers, Matthew 24 Jun '19

24 Jun '19

Hi all, I have a scientific application which runs much slower under Wine than on Windows for one type of data (read with a vendor's closed-source .NET DLLs). For most other types of data (read with other vendors' closed-source DLLs, some .NET, some not), the performance is nearly the same. I'm trying to understand why. I have run sysprof on both types of data trying to understand the difference, but without the Windows symbols I don't really understand what I'm looking at. I also ran perf and generated these interactive flame graphs. Perf from the slow data vendor (Thermo): Perf from one of the fast data vendor (Bruker): Can someone point me in a better direction for understanding what's causing this performance difference? Thanks, -Matt

1 0

[PATCH 2/3] ntoskrnl.exe: Implement ExInitializePagedLookasideList.
by Jacek Caban 24 Jun '19

24 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47014 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 57 ++++++++++++++++++-------------- dlls/ntoskrnl.exe/tests/driver.c | 24 ++++++++++++++ include/ddk/wdm.h | 11 +++++- 3 files changed, 66 insertions(+), 26 deletions(-)

2 1

[PATCH 1/3] ntoskrnl.exe: Implement IoGetStackLimits.
by Jacek Caban 24 Jun '19

24 Jun '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47017 Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 12 ++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 11 +++++++++++ include/ddk/wdm.h | 1 + 4 files changed, 25 insertions(+), 1 deletion(-)

2 1

[PATCH 3/3] ntoskrnl.exe: Implement ExDeletePagedLookasideList.
by Jacek Caban 24 Jun '19

24 Jun '19

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

1 0