wine-devel April 2019

wine-devel@winehq.org

82 participants
743 discussions

[PATCH 4/5] wined3d: Don't bother allocating "free_occlusion_queries" in context_create().
by Henri Verbeet 19 Apr '19

19 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 476d96939b8..ab5d9c3ee97 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1902,12 +1902,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->timestamp_queries); - context->free_occlusion_query_size = 4; - if (!(context->free_occlusion_queries = heap_calloc(context->free_occlusion_query_size, - sizeof(*context->free_occlusion_queries)))) - goto out; list_init(&context->occlusion_queries); - list_init(&context->fences); list_init(&context->so_statistics_queries); list_init(&context->pipeline_statistics_queries); @@ -1987,7 +1982,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context); return NULL; -- 2.11.0

1 0

[PATCH 3/5] wined3d: Don't bother allocating "free_fences" in context_create().
by Henri Verbeet 19 Apr '19

19 Apr '19

We use "free_fences" with wined3d_array_reserve(), which handles NULL fine. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/context.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 425721aaa23..476d96939b8 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1908,13 +1908,8 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, goto out; list_init(&context->occlusion_queries); - context->free_fence_size = 4; - if (!(context->free_fences = heap_calloc(context->free_fence_size, sizeof(*context->free_fences)))) - goto out; list_init(&context->fences); - list_init(&context->so_statistics_queries); - list_init(&context->pipeline_statistics_queries); list_init(&context->fbo_list); @@ -1992,7 +1987,6 @@ out: wined3d_release_dc(swapchain->win_handle, context->hdc); device->shader_backend->shader_free_context_data(context); device->adapter->fragment_pipe->free_context_data(context); - heap_free(context->free_fences); heap_free(context->free_occlusion_queries); heap_free(context->free_timestamp_queries); heap_free(context); -- 2.11.0

1 0

[PATCH 2/5] wined3d: Assign "adapter_ops" in wined3d_adapter_init().
by Henri Verbeet 19 Apr '19

19 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 3 +-- dlls/wined3d/adapter_vk.c | 3 +-- dlls/wined3d/directx.c | 7 ++++--- dlls/wined3d/wined3d_private.h | 3 ++- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index d8414204ea0..0f554e7cf2e 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4570,7 +4570,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal, &wined3d_adapter_gl_ops)) return FALSE; /* Dynamically load all GL core functions */ @@ -4660,7 +4660,6 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); - adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } diff --git a/dlls/wined3d/adapter_vk.c b/dlls/wined3d/adapter_vk.c index 4c01fb8fe86..464f7914098 100644 --- a/dlls/wined3d/adapter_vk.c +++ b/dlls/wined3d/adapter_vk.c @@ -648,7 +648,7 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, TRACE("adapter_vk %p, ordinal %u, wined3d_creation_flags %#x.\n", adapter_vk, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_vk_ops)) return FALSE; if (!wined3d_init_vulkan(vk_info)) @@ -687,7 +687,6 @@ static BOOL wined3d_adapter_vk_init(struct wined3d_adapter_vk *adapter_vk, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->adapter_ops = &wined3d_adapter_vk_ops; adapter->d3d_info.wined3d_creation_flags = wined3d_creation_flags; diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 3c89fad7d1a..cacd9ac1849 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -2284,7 +2284,7 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vram_bytes_used = 0; TRACE("Emulating 0x%s bytes of video ram.\n", wine_dbgstr_longlong(adapter->driver_info.vram_bytes)); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(adapter, ordinal, &wined3d_adapter_no3d_ops)) { heap_free(adapter); return NULL; @@ -2299,7 +2299,6 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, adapter->vertex_pipe = &none_vertex_pipe; adapter->fragment_pipe = &none_fragment_pipe; adapter->shader_backend = &none_shader_backend; - adapter->adapter_ops = &wined3d_adapter_no3d_ops; wined3d_adapter_no3d_init_d3d_info(adapter, wined3d_creation_flags); @@ -2308,7 +2307,8 @@ static struct wined3d_adapter *wined3d_adapter_no3d_create(unsigned int ordinal, return adapter; } -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) { DISPLAY_DEVICEW display_device; @@ -2331,6 +2331,7 @@ BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) memset(&adapter->device_uuid, 0, sizeof(adapter->device_uuid)); adapter->formats = NULL; + adapter->adapter_ops = adapter_ops; return TRUE; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 15876e4f1ed..cf46f808e25 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2730,7 +2730,8 @@ struct wined3d_adapter const struct wined3d_adapter_ops *adapter_ops; }; -BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal) DECLSPEC_HIDDEN; +BOOL wined3d_adapter_init(struct wined3d_adapter *adapter, unsigned int ordinal, + const struct wined3d_adapter_ops *adapter_ops) DECLSPEC_HIDDEN; void wined3d_adapter_cleanup(struct wined3d_adapter *adapter) DECLSPEC_HIDDEN; struct wined3d_adapter_gl -- 2.11.0

1 0

[PATCH 1/5] wined3d: Pass a wined3d_adapter_gl structure to wined3d_adapter_gl_init().
by Henri Verbeet 19 Apr '19

19 Apr '19

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> --- dlls/wined3d/adapter_gl.c | 29 +++++++++++++---------------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 36c29c9a7f5..d8414204ea0 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -4554,7 +4554,7 @@ static const struct wined3d_adapter_ops wined3d_adapter_gl_ops = adapter_gl_check_format, }; -static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, +static BOOL wined3d_adapter_gl_init(struct wined3d_adapter_gl *adapter_gl, unsigned int ordinal, unsigned int wined3d_creation_flags) { static const DWORD supported_gl_versions[] = @@ -4563,19 +4563,16 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, MAKEDWORD_VERSION(3, 2), MAKEDWORD_VERSION(1, 0), }; - struct wined3d_gl_info *gl_info = &adapter->gl_info; + struct wined3d_gl_info *gl_info = &adapter_gl->a.gl_info; struct wined3d_caps_gl_ctx caps_gl_ctx = {0}; - struct wined3d_adapter_gl *adapter_gl; unsigned int i; - TRACE("adapter %p, ordinal %u, wined3d_creation_flags %#x.\n", - adapter, ordinal, wined3d_creation_flags); + TRACE("adapter_gl %p, ordinal %u, wined3d_creation_flags %#x.\n", + adapter_gl, ordinal, wined3d_creation_flags); - if (!wined3d_adapter_init(adapter, ordinal)) + if (!wined3d_adapter_init(&adapter_gl->a, ordinal)) return FALSE; - adapter_gl = wined3d_adapter_gl(adapter); - /* Dynamically load all GL core functions */ #ifdef USE_WIN32_OPENGL { @@ -4601,9 +4598,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, glEnableWINE = gl_info->gl_ops.gl.p_glEnable; glDisableWINE = gl_info->gl_ops.gl.p_glDisable; - if (!wined3d_caps_gl_ctx_create(adapter, &caps_gl_ctx)) + if (!wined3d_caps_gl_ctx_create(&adapter_gl->a, &caps_gl_ctx)) { - ERR("Failed to get a GL context for adapter %p.\n", adapter); + ERR("Failed to get a GL context for adapter %p.\n", adapter_gl); return FALSE; } @@ -4630,9 +4627,9 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, supported_gl_versions[i] >> 16, supported_gl_versions[i] & 0xffff); } - if (!wined3d_adapter_init_gl_caps(adapter, &caps_gl_ctx, wined3d_creation_flags)) + if (!wined3d_adapter_init_gl_caps(&adapter_gl->a, &caps_gl_ctx, wined3d_creation_flags)) { - ERR("Failed to initialize GL caps for adapter %p.\n", adapter); + ERR("Failed to initialize GL caps for adapter %p.\n", adapter_gl); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); return FALSE; } @@ -4652,7 +4649,7 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, return FALSE; } - if (!wined3d_adapter_gl_init_format_info(adapter, &caps_gl_ctx)) + if (!wined3d_adapter_gl_init_format_info(&adapter_gl->a, &caps_gl_ctx)) { ERR("Failed to initialize GL format info.\n"); wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); @@ -4662,8 +4659,8 @@ static BOOL wined3d_adapter_gl_init(struct wined3d_adapter *adapter, wined3d_caps_gl_ctx_destroy(&caps_gl_ctx); - wined3d_adapter_init_ffp_attrib_ops(adapter); - adapter->adapter_ops = &wined3d_adapter_gl_ops; + wined3d_adapter_init_ffp_attrib_ops(&adapter_gl->a); + adapter_gl->a.adapter_ops = &wined3d_adapter_gl_ops; return TRUE; } @@ -4675,7 +4672,7 @@ struct wined3d_adapter *wined3d_adapter_gl_create(unsigned int ordinal, unsigned if (!(adapter = heap_alloc_zero(sizeof(*adapter)))) return NULL; - if (!wined3d_adapter_gl_init(&adapter->a, ordinal, wined3d_creation_flags)) + if (!wined3d_adapter_gl_init(adapter, ordinal, wined3d_creation_flags)) { heap_free(adapter); return NULL; -- 2.11.0

1 0

[PATCH 1/4] ntoskrnl.exe: Implement PsLookupThreadByThreadId.
by Jacek Caban 19 Apr '19

19 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 20 ++++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 2 +- dlls/ntoskrnl.exe/tests/driver.c | 16 ++++++++++++++++ include/ddk/ntifs.h | 1 + 4 files changed, 38 insertions(+), 1 deletion(-)

2 1

[PATCH 4/4] ntoskrnl.exe: Implement PsLookupProcessByProcessId.
by Jacek Caban 19 Apr '19

19 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 30 +++++++++++++++++++----------- include/ddk/ntifs.h | 1 + 2 files changed, 20 insertions(+), 11 deletions(-)

1 0

[PATCH 3/4] ntoskrnl.exe: Implement process object constructor.
by Jacek Caban 19 Apr '19

19 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/ntoskrnl.exe/ntoskrnl.c | 14 +++++++++++++- dlls/ntoskrnl.exe/ntoskrnl_private.h | 4 ++++ 2 files changed, 17 insertions(+), 1 deletion(-)

1 0

[PATCH 2/4] server: Allow creating process kernel objects.
by Jacek Caban 19 Apr '19

19 Apr '19

From: Derek Lesho <dereklesho52(a)gmail.com> Signed-off-by: Derek Lesho <dereklesho52(a)Gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- server/process.c | 10 +++++++++- server/process.h | 1 + 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[PATCH] wined3d: Use intBitsToFloat() instead of uintBitsToFloat().
by Paul Gofman 19 Apr '19

19 Apr '19

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=47039 There is no uint type in GLSL version < 1.3, while ARB_shader_bit_encoding may still be supported. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- Supersedes patch https://source.winehq.org/patches/data/163199 (wined3d: Check GLSL version when using ARB_shader_bit_encoding with uvec4). dlls/wined3d/glsl_shader.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 7d4678965d..05736084b0 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -444,11 +444,11 @@ static void shader_glsl_append_imm_vec4(struct wined3d_string_buffer *buffer, co if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - const unsigned int *uint_values = (const unsigned int *)values; + const int *int_values = (const int *)values; - shader_addline(buffer, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))\n" - " /* %s, %s, %s, %s */", uint_values[0], uint_values[1], - uint_values[2], uint_values[3], str[0], str[1], str[2], str[3]); + shader_addline(buffer, "intBitsToFloat(ivec4(%d, %d, %d, %d))\n" + " /* %s, %s, %s, %s */", int_values[0], int_values[1], + int_values[2], int_values[3], str[0], str[1], str[2], str[3]); } else shader_addline(buffer, "vec4(%s, %s, %s, %s)", str[0], str[1], str[2], str[3]); @@ -3288,7 +3288,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - string_buffer_sprintf(register_name, "uintBitsToFloat(%#xu)", reg->u.immconst_data[0]); + string_buffer_sprintf(register_name, "intBitsToFloat(%d)", reg->u.immconst_data[0]); } else { @@ -3318,7 +3318,7 @@ static void shader_glsl_get_register_name(const struct wined3d_shader_register * case WINED3D_DATA_FLOAT: if (gl_info->supported[ARB_SHADER_BIT_ENCODING]) { - string_buffer_sprintf(register_name, "uintBitsToFloat(uvec4(%#xu, %#xu, %#xu, %#xu))", + string_buffer_sprintf(register_name, "intBitsToFloat(ivec4(%d, %d, %d, %d))", reg->u.immconst_data[0], reg->u.immconst_data[1], reg->u.immconst_data[2], reg->u.immconst_data[3]); } -- 2.20.1

2 1

[PATCH] wineserver: link to the inotify library on non-Linux systems
by Damjan Jovanovic 19 Apr '19

19 Apr '19

Outside Linux, wineserver fails to link when sys/inotify.h is present, as it tries to find inotify symbols in libc, which doesn't have them. The inotify symbols are in libinotify.so. Detect it properly, and link to it where available. Does not regenerate "configure". Signed-off-by: Damjan Jovanovic <damjan.jov(a)gmail.com> --- configure.ac | 11 ++++++++++- server/Makefile.in | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-)

2 2

← Newer
1
...
25
26
27
28
29
30
31
...
75
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-devel April 2019