wine-commits May 2019

wine-commits@winehq.org

2 participants
1019 discussions

Matteo Bruni : wined3d: Pass a wined3d_context_gl structure to context_update_stream_sources().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 33d382194310253245f8fb17431dfd9f69375fda URL: https://source.winehq.org/git/wine.git/?a=commit;h=33d382194310253245f8fb17… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 14 15:44:25 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_update_stream_sources(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 18 +++++++++--------- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 5183265..cda1ea0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5531,24 +5531,24 @@ static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *c checkGLcall("Loading numbered arrays"); } -void context_update_stream_sources(struct wined3d_context *context, const struct wined3d_state *state) +void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) { - - if (context->use_immediate_mode_draw) + if (context_gl->c.use_immediate_mode_draw) return; - context_unload_vertex_data(context); - if (context->d3d_info->ffp_generic_attributes || use_vs(state)) + context_unload_vertex_data(&context_gl->c); + if (context_gl->c.d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); - wined3d_context_gl_load_numbered_arrays(wined3d_context_gl(context), &context->stream_info, state); + wined3d_context_gl_load_numbered_arrays(context_gl, &context_gl->c.stream_info, state); return; } TRACE("Loading named arrays.\n"); - context_unload_numbered_arrays(context); - context_load_vertex_data(context, &context->stream_info, state); - context->namedArraysLoaded = TRUE; + context_unload_numbered_arrays(&context_gl->c); + context_load_vertex_data(&context_gl->c, &context_gl->c.stream_info, state); + context_gl->c.namedArraysLoaded = TRUE; } static void apply_texture_blit_state(const struct wined3d_gl_info *gl_info, struct gl_texture *texture, diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 729100a..08423e8 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -3863,14 +3863,14 @@ static void streamsrc(struct wined3d_context *context, const struct wined3d_stat { if (isStateDirty(context, STATE_VDECL)) return; - context_update_stream_sources(context, state); + wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); } static void vdecl_miscpart(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { if (isStateDirty(context, STATE_STREAMSRC)) return; - context_update_stream_sources(context, state); + wined3d_context_gl_update_stream_sources(wined3d_context_gl(context), state); } static void vertexdeclaration(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0aa3795..0a8c8ca 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2080,6 +2080,8 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; void wined3d_context_gl_load_tex_coords(const struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *si, GLuint *current_bo, const struct wined3d_state *state) DECLSPEC_HIDDEN; +void wined3d_context_gl_update_stream_sources(struct wined3d_context_gl *context_gl, + const struct wined3d_state *state) DECLSPEC_HIDDEN; HRESULT wined3d_context_vk_init(struct wined3d_context *context_vk, struct wined3d_swapchain *swapchain) DECLSPEC_HIDDEN; @@ -2264,8 +2266,6 @@ void context_texture_update(struct wined3d_context *context, void context_unload_tex_coords(const struct wined3d_context *context) DECLSPEC_HIDDEN; void context_unmap_bo_address(struct wined3d_context *context, const struct wined3d_bo_address *data, GLenum binding) DECLSPEC_HIDDEN; -void context_update_stream_sources(struct wined3d_context *context, - const struct wined3d_state *state) DECLSPEC_HIDDEN; /***************************************************************************** * Internal representation of a light

1 0

Matteo Bruni : wined3d: Pass a wined3d_context_gl structure to context_load_numbered_arrays().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 24f906f497729b07876e54d925a56579617eeeff URL: https://source.winehq.org/git/wine.git/?a=commit;h=24f906f497729b07876e54d9… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Tue May 14 15:44:24 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_load_numbered_arrays(). Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2e4869b..5183265 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -5334,9 +5334,10 @@ static void context_unload_numbered_arrays(struct wined3d_context *context) } } -static void context_load_numbered_arrays(struct wined3d_context *context, +static void wined3d_context_gl_load_numbered_arrays(struct wined3d_context_gl *context_gl, const struct wined3d_stream_info *stream_info, const struct wined3d_state *state) { + struct wined3d_context *context = &context_gl->c; const struct wined3d_shader *vs = state->shader[WINED3D_SHADER_TYPE_VERTEX]; const struct wined3d_gl_info *gl_info = context->gl_info; GLuint current_bo; @@ -5540,7 +5541,7 @@ void context_update_stream_sources(struct wined3d_context *context, const struct if (context->d3d_info->ffp_generic_attributes || use_vs(state)) { TRACE("Loading numbered arrays.\n"); - context_load_numbered_arrays(context, &context->stream_info, state); + wined3d_context_gl_load_numbered_arrays(wined3d_context_gl(context), &context->stream_info, state); return; }

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_apply_clear_state().
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: dfe7e9106083cf8e2ef0eefa447f507140b7838c URL: https://source.winehq.org/git/wine.git/?a=commit;h=dfe7e9106083cf8e2ef0eefa… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:23 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_apply_clear_state(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 50 +++++++++++++++++++++--------------------- dlls/wined3d/device.c | 4 +++- dlls/wined3d/wined3d_private.h | 16 +++++++------- 3 files changed, 36 insertions(+), 34 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=dfe7e9106083cf8e2ef0…

1 0

Henri Verbeet : wined3d: Move the pipeline statistics query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 776b84e6a589fa4fd57616793ee4644ad9e55709 URL: https://source.winehq.org/git/wine.git/?a=commit;h=776b84e6a589fa4fd5761679… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:22 2019 +0430 wined3d: Move the pipeline statistics query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 73 ++++++++++++++++++------------------------ dlls/wined3d/query.c | 20 ++++++------ dlls/wined3d/wined3d_private.h | 20 ++++++------ 3 files changed, 50 insertions(+), 63 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=776b84e6a589fa4fd576…

1 0

Henri Verbeet : wined3d: Move the stream-output statistics query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: cc5e38e1bf3be426da90908b6fb7b4059f9ed5c0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cc5e38e1bf3be426da90908b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:21 2019 +0430 wined3d: Move the stream-output statistics query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 67 ++++++++++++++++++++---------------------- dlls/wined3d/query.c | 20 ++++++------- dlls/wined3d/wined3d_private.h | 19 ++++++------ 3 files changed, 51 insertions(+), 55 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=cc5e38e1bf3be426da90…

1 0

Henri Verbeet : wined3d: Move the timestamp query fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: f942b20a97199ee62cb174e7bee012943abbdd56 URL: https://source.winehq.org/git/wine.git/?a=commit;h=f942b20a97199ee62cb174e7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:20 2019 +0430 wined3d: Move the timestamp query fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 57 +++++++++++++++++++++--------------------- dlls/wined3d/query.c | 12 ++++----- dlls/wined3d/wined3d_private.h | 18 ++++++------- 3 files changed, 44 insertions(+), 43 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=f942b20a97199ee62cb1…

1 0

Henri Verbeet : wined3d: Move the fence fields from struct wined3d_context to struct wined3d_context_gl.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: bc6667b0d00c90cb98ba2087f79e72a7e45fdc2d URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc6667b0d00c90cb98ba2087… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue May 14 15:44:19 2019 +0430 wined3d: Move the fence fields from struct wined3d_context to struct wined3d_context_gl. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 127 +++++++++++++++++++++-------------------- dlls/wined3d/query.c | 26 ++++----- dlls/wined3d/wined3d_private.h | 17 +++--- 3 files changed, 86 insertions(+), 84 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=bc6667b0d00c90cb98ba…

1 0

Matteo Bruni : d3d8: Always allow read and write map access to non-DEFAULT buffers.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 7dfc56937d95cbfac0dc0c2c2e2ef3a610825292 URL: https://source.winehq.org/git/wine.git/?a=commit;h=7dfc56937d95cbfac0dc0c2c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:19 2019 +0200 d3d8: Always allow read and write map access to non-DEFAULT buffers. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 822730f..8598766 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -309,6 +309,9 @@ HRESULT vertexbuffer_init(struct d3d8_vertexbuffer *buffer, struct d3d8_device * desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -628,6 +631,9 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : d3d9: Always allow read and write map access to non-DEFAULT buffers.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 9d9dd8b378b84e125f877a1c675c5b9a5ffa673f URL: https://source.winehq.org/git/wine.git/?a=commit;h=9d9dd8b378b84e125f877a1c… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:18 2019 +0200 d3d9: Always allow read and write map access to non-DEFAULT buffers. D3d9 is very lax WRT map access to buffers and there isn't really much of a reason for us to restrict read access to non-DEFAULT resources. On the other hand, we'd still really like to be able to ensure that DEFAULT, DYNAMIC | WRITEONLY buffers get allocated in the proper memory region and get efficient data uploads, so keep the restriction for DEFAULT resources. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46849 Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index 43321b3..46d11e7 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -316,6 +316,9 @@ HRESULT vertexbuffer_init(struct d3d9_vertexbuffer *buffer, struct d3d9_device * desc.usage = usage & WINED3DUSAGE_MASK; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0; @@ -639,6 +642,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; desc.bind_flags = 0; desc.access = wined3daccess_from_d3dpool(pool, usage) | map_access_from_usage(usage); + /* Buffers are always readable. */ + if (pool != D3DPOOL_DEFAULT) + desc.access |= WINED3D_RESOURCE_ACCESS_MAP_R | WINED3D_RESOURCE_ACCESS_MAP_W; desc.misc_flags = 0; desc.structure_byte_stride = 0;

1 0

Matteo Bruni : wined3d: Avoid a GCC 8 warning.
by Alexandre Julliard 14 May '19

14 May '19

Module: wine Branch: master Commit: 3724e9c4abb43a7e5a044bcc17010660d55c4ff3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=3724e9c4abb43a7e5a044bcc… Author: Matteo Bruni <mbruni(a)codeweavers.com> Date: Mon May 13 20:34:17 2019 +0200 wined3d: Avoid a GCC 8 warning. Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index b183704..de32587 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -226,7 +226,7 @@ struct recorded_instruction struct shader_arb_ctx_priv { - char addr_reg[20]; + char addr_reg[50]; enum { /* plain GL_ARB_vertex_program or GL_ARB_fragment_program */

1 0

Jump to page:

2025

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-commits May 2019