wine-commits March 2019

wine-commits@winehq.org

2 participants
1097 discussions

Gabriel Ivăncescu : include: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: c81db565a758a8703cabcd05ad78e8bcb5a38881 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c81db565a758a8703cabcd05… Author: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Date: Mon Mar 4 18:25:14 2019 +0200 include: Add CDRF_DOERASE and CDRF_SKIPPOSTPAINT definitions. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/commctrl.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/commctrl.h b/include/commctrl.h index 73bb9fa..9b86bdb 100644 --- a/include/commctrl.h +++ b/include/commctrl.h @@ -216,11 +216,13 @@ typedef struct tagNMCHAR #define CDRF_DODEFAULT 0x0 #define CDRF_NEWFONT 0x00000002 #define CDRF_SKIPDEFAULT 0x00000004 +#define CDRF_DOERASE 0x00000008 #define CDRF_NOTIFYPOSTPAINT 0x00000010 #define CDRF_NOTIFYITEMDRAW 0x00000020 #define CDRF_NOTIFYSUBITEMDRAW 0x00000020 #define CDRF_NOTIFYPOSTERASE 0x00000040 #define CDRF_NOTIFYITEMERASE 0x00000080 /* obsolete ??? */ +#define CDRF_SKIPPOSTPAINT 0x00000100 /* drawstage flags */

1 0

Józef Kucia : wined3d: Rename state entry structures.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 32c54006d275b75b9861e1180ace8abb3a0b3cc4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=32c54006d275b75b9861e118… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:27 2019 +0100 wined3d: Rename state entry structures. Signed-off-by: Józef Kucia <jkucia(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 +- dlls/wined3d/ati_fragment_shader.c | 3 ++- dlls/wined3d/context.c | 4 ++-- dlls/wined3d/glsl_shader.c | 4 ++-- dlls/wined3d/nvidia_texture_shader.c | 2 +- dlls/wined3d/state.c | 16 ++++++++-------- dlls/wined3d/wined3d_private.h | 26 +++++++++++++------------- 7 files changed, 29 insertions(+), 28 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=32c54006d275b75b9861…

1 0

Józef Kucia : wined3d: Rename StateTable.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 1d1511f66d19e93a2d62da88c17ae810467e6977 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d1511f66d19e93a2d62da88… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:26 2019 +0100 wined3d: Rename StateTable. Signed-off-by: Józef Kucia <jkucia(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 | 2 +- dlls/wined3d/device.c | 10 ++++----- dlls/wined3d/state.c | 49 +++++++++++++++++++++++------------------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 34 insertions(+), 31 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 122ed70..37264a0 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1953,7 +1953,7 @@ struct wined3d_context *context_create(struct wined3d_swapchain *swapchain, context->win_handle = swapchain->win_handle; context->gl_info = &device->adapter->gl_info; context->d3d_info = &device->adapter->d3d_info; - context->state_table = device->StateTable; + context->state_table = device->state_table; /* Mark all states dirty to force a proper initialization of the states on * the first use of the context. Compute states do not need initialization. */ diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 61896a2..79a5b68 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5357,7 +5357,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, wine_rb_init(&device->samplers, wined3d_sampler_compare); if (vertex_pipeline->vp_states && fragment_pipeline->states - && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, + && FAILED(hr = compile_state_table(device->state_table, device->multistate_funcs, &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { @@ -5396,11 +5396,9 @@ err: void device_invalidate_state(const struct wined3d_device *device, DWORD state) { - DWORD rep = device->StateTable[state].representative; + DWORD rep = device->state_table[state].representative; struct wined3d_context *context; - DWORD idx; - BYTE shift; - UINT i; + unsigned int i, idx, shift; wined3d_from_cs(device->cs); @@ -5414,7 +5412,7 @@ void device_invalidate_state(const struct wined3d_device *device, DWORD state) for (i = 0; i < device->context_count; ++i) { context = device->contexts[i]; - if(isStateDirty(context, rep)) continue; + if (isStateDirty(context, rep)) continue; context->dirtyArray[context->numDirtyEntries++] = rep; idx = rep / (sizeof(*context->isStateDirty) * CHAR_BIT); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 969dfc2..9dc9804 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5519,39 +5519,43 @@ static void validate_state_table(struct StateEntry *state_table) } } -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { - unsigned int i, type, handlers; APPLYSTATEFUNC multistate_funcs[STATE_HIGHEST + 1][3]; const struct StateEntryTemplate *cur; + unsigned int i, type, handlers; BOOL set[STATE_HIGHEST + 1]; memset(multistate_funcs, 0, sizeof(multistate_funcs)); - for(i = 0; i < STATE_HIGHEST + 1; i++) { - StateTable[i].representative = 0; - StateTable[i].apply = state_undefined; + for (i = 0; i < STATE_HIGHEST + 1; ++i) + { + state_table[i].representative = 0; + state_table[i].apply = state_undefined; } - for(type = 0; type < 3; type++) { + for (type = 0; type < 3; ++type) + { /* This switch decides the order in which the states are applied */ - switch(type) { + switch (type) + { case 0: cur = misc; break; case 1: cur = fragment->states; break; case 2: cur = vertex->vp_states; break; default: cur = NULL; /* Stupid compiler */ } - if(!cur) continue; + if (!cur) continue; /* GL extension filtering should not prevent multiple handlers being applied from different * pipeline parts */ memset(set, 0, sizeof(set)); - for(i = 0; cur[i].state; i++) { + for (i = 0; cur[i].state; ++i) + { APPLYSTATEFUNC *funcs_array; /* Only use the first matching state with the available extension from one template. @@ -5561,7 +5565,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ * * if GL_XYZ_fancy is supported, ignore the 2nd line */ - if(set[cur[i].state]) continue; + if (set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; @@ -5576,12 +5580,13 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ handlers = num_handlers(multistate_funcs[cur[i].state]); multistate_funcs[cur[i].state][handlers] = cur[i].content.apply; - switch(handlers) { + switch (handlers) + { case 0: - StateTable[cur[i].state].apply = cur[i].content.apply; + state_table[cur[i].state].apply = cur[i].content.apply; break; case 1: - StateTable[cur[i].state].apply = multistate_apply_2; + state_table[cur[i].state].apply = multistate_apply_2; if (!(dev_multistate_funcs[cur[i].state] = heap_calloc(2, sizeof(**dev_multistate_funcs)))) goto out_of_mem; @@ -5589,7 +5594,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][1] = multistate_funcs[cur[i].state][1]; break; case 2: - StateTable[cur[i].state].apply = multistate_apply_3; + state_table[cur[i].state].apply = multistate_apply_3; if (!(funcs_array = heap_realloc(dev_multistate_funcs[cur[i].state], sizeof(**dev_multistate_funcs) * 3))) goto out_of_mem; @@ -5598,22 +5603,22 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ dev_multistate_funcs[cur[i].state][2] = multistate_funcs[cur[i].state][2]; break; default: - ERR("Unexpected amount of state handlers for state %u: %u\n", - cur[i].state, handlers + 1); + ERR("Unexpected amount of state handlers for state %u: %u.\n", + cur[i].state, handlers + 1); } - if (StateTable[cur[i].state].representative - && StateTable[cur[i].state].representative != cur[i].content.representative) + if (state_table[cur[i].state].representative + && state_table[cur[i].state].representative != cur[i].content.representative) { FIXME("State %s (%#x) has different representatives in different pipeline parts.\n", debug_d3dstate(cur[i].state), cur[i].state); } - StateTable[cur[i].state].representative = cur[i].content.representative; + state_table[cur[i].state].representative = cur[i].content.representative; } } - prune_invalid_states(StateTable, d3d_info); - validate_state_table(StateTable); + prune_invalid_states(state_table, d3d_info); + validate_state_table(state_table); return WINED3D_OK; @@ -5623,7 +5628,7 @@ out_of_mem: heap_free(dev_multistate_funcs[i]); } - memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1)*sizeof(*dev_multistate_funcs)); + memset(dev_multistate_funcs, 0, (STATE_HIGHEST + 1) * sizeof(*dev_multistate_funcs)); return E_OUTOFMEMORY; } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 51b86a7..8fe3310 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2107,7 +2107,7 @@ extern const struct wined3d_vertex_pipe_ops ffp_vertex_pipe DECLSPEC_HIDDEN; extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ -HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, +HRESULT compile_state_table(struct StateEntry *state_table, APPLYSTATEFUNC **dev_multistate_funcs, const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN; @@ -3038,7 +3038,7 @@ struct wined3d_device void *shader_priv; void *fragment_priv; void *vertex_priv; - struct StateEntry StateTable[STATE_HIGHEST + 1]; + struct StateEntry state_table[STATE_HIGHEST + 1]; /* Array of functions for states which are handled by more than one pipeline part */ APPLYSTATEFUNC *multistate_funcs[STATE_HIGHEST + 1]; struct wined3d_blitter *blitter;

1 0

Józef Kucia : wined3d: Avoid passing gl_info to compile_state_table().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: a2954a712154272b2baa578dfb25ea62764d7f76 URL: https://source.winehq.org/git/wine.git/?a=commit;h=a2954a712154272b2baa578d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:25 2019 +0100 wined3d: Avoid passing gl_info to compile_state_table(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 2 +- dlls/wined3d/state.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 4caa1e8..61896a2 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -5358,7 +5358,7 @@ HRESULT device_init(struct wined3d_device *device, struct wined3d *wined3d, if (vertex_pipeline->vp_states && fragment_pipeline->states && FAILED(hr = compile_state_table(device->StateTable, device->multistate_funcs, - &adapter->gl_info, &adapter->d3d_info, vertex_pipeline, + &adapter->d3d_info, adapter->gl_info.supported, vertex_pipeline, fragment_pipeline, misc_state_template))) { ERR("Failed to compile state table, hr %#x.\n", hr); diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index 7952579..969dfc2 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5520,7 +5520,7 @@ static void validate_state_table(struct StateEntry *state_table) } HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) { @@ -5563,7 +5563,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ */ if(set[cur[i].state]) continue; /* Skip state lines depending on unsupported extensions */ - if (!gl_info->supported[cur[i].extension]) continue; + if (!supported_extensions[cur[i].extension]) continue; set[cur[i].state] = TRUE; /* In some cases having an extension means that nothing has to be * done for a state, e.g. if GL_ARB_texture_non_power_of_two is diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3d51a90..51b86a7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2037,7 +2037,7 @@ struct StateEntryTemplate { DWORD state; struct StateEntry content; - enum wined3d_gl_extension extension; + unsigned int extension; }; #define WINED3D_FRAGMENT_CAP_PROJ_CONTROL 0x00000001 @@ -2108,7 +2108,7 @@ extern const struct wined3d_vertex_pipe_ops glsl_vertex_pipe DECLSPEC_HIDDEN; /* "Base" state table */ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_multistate_funcs, - const struct wined3d_gl_info *gl_info, const struct wined3d_d3d_info *d3d_info, + const struct wined3d_d3d_info *d3d_info, const BOOL *supported_extensions, const struct wined3d_vertex_pipe_ops *vertex, const struct fragment_pipeline *fragment, const struct StateEntryTemplate *misc) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Avoid passing gl_info to prune_invalid_states().
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 3ef1c469bd5f35a7d686b7ecd8c72b8c4f42368e URL: https://source.winehq.org/git/wine.git/?a=commit;h=3ef1c469bd5f35a7d686b7ec… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:24 2019 +0100 wined3d: Avoid passing gl_info to prune_invalid_states(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/state.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/state.c b/dlls/wined3d/state.c index f049ad9..7952579 100644 --- a/dlls/wined3d/state.c +++ b/dlls/wined3d/state.c @@ -5386,8 +5386,7 @@ static void multistate_apply_3(struct wined3d_context *context, const struct win context->device->multistate_funcs[state_id][2](context, state, state_id); } -static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_gl_info *gl_info, - const struct wined3d_d3d_info *d3d_info) +static void prune_invalid_states(struct StateEntry *state_table, const struct wined3d_d3d_info *d3d_info) { unsigned int start, last, i; @@ -5613,7 +5612,7 @@ HRESULT compile_state_table(struct StateEntry *StateTable, APPLYSTATEFUNC **dev_ } } - prune_invalid_states(StateTable, gl_info, d3d_info); + prune_invalid_states(StateTable, d3d_info); validate_state_table(StateTable); return WINED3D_OK;

1 0

Józef Kucia : wined3d: Introduce general helper function to get sample count for resource.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: e4bf926c3b88ac47c980498f0602887c13967157 URL: https://source.winehq.org/git/wine.git/?a=commit;h=e4bf926c3b88ac47c980498f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:23 2019 +0100 wined3d: Introduce general helper function to get sample count for resource. For Vulkan backend. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/resource.c | 32 ++++++++++++++++++++++++++++++++ dlls/wined3d/texture.c | 36 ++---------------------------------- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 35 insertions(+), 34 deletions(-) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index ba71df1..2897ab1 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -509,3 +509,35 @@ const struct wined3d_format *wined3d_resource_get_decompress_format(const struct return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM_SRGB, resource->bind_flags); return wined3d_get_format(adapter, WINED3DFMT_B8G8R8A8_UNORM, resource->bind_flags); } + +unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) +{ + const struct wined3d_format *format = resource->format; + + /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) + * feature through type == MULTISAMPLE_XX and quality != 0. This could + * be mapped to GL_NV_framebuffer_multisample_coverage. + * + * AMD have a similar feature called Enhanced Quality Anti-Aliasing + * (EQAA), but it does not have an equivalent OpenGL extension. */ + + /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality + * levels as the count of advertised multisample types for the texture + * format. */ + if (resource->multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) + { + unsigned int i, count = 0; + + for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) + { + if (format->multisample_types & 1u << i) + { + if (resource->multisample_quality == count++) + break; + } + } + return i + 1; + } + + return resource->multisample_type; +} diff --git a/dlls/wined3d/texture.c b/dlls/wined3d/texture.c index cb9ac2a..55c9543 100644 --- a/dlls/wined3d/texture.c +++ b/dlls/wined3d/texture.c @@ -530,38 +530,6 @@ static void gltexture_delete(struct wined3d_device *device, const struct wined3d tex->name = 0; } -static unsigned int wined3d_texture_get_gl_sample_count(const struct wined3d_texture *texture) -{ - const struct wined3d_format *format = texture->resource.format; - - /* TODO: NVIDIA expose their Coverage Sample Anti-Aliasing (CSAA) - * feature through type == MULTISAMPLE_XX and quality != 0. This could - * be mapped to GL_NV_framebuffer_multisample_coverage. - * - * AMD have a similar feature called Enhanced Quality Anti-Aliasing - * (EQAA), but it does not have an equivalent OpenGL extension. */ - - /* We advertise as many WINED3D_MULTISAMPLE_NON_MASKABLE quality - * levels as the count of advertised multisample types for the texture - * format. */ - if (texture->resource.multisample_type == WINED3D_MULTISAMPLE_NON_MASKABLE) - { - unsigned int i, count = 0; - - for (i = 0; i < sizeof(format->multisample_types) * CHAR_BIT; ++i) - { - if (format->multisample_types & 1u << i) - { - if (texture->resource.multisample_quality == count++) - break; - } - } - return i + 1; - } - - return texture->resource.multisample_type; -} - /* Context activation is done by the caller. */ /* The caller is responsible for binding the correct texture. */ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_gl *texture_gl, @@ -624,7 +592,7 @@ static void wined3d_texture_gl_allocate_mutable_storage(struct wined3d_texture_g static void wined3d_texture_gl_allocate_immutable_storage(struct wined3d_texture_gl *texture_gl, GLenum gl_internal_format, const struct wined3d_gl_info *gl_info) { - unsigned int samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); + unsigned int samples = wined3d_resource_get_sample_count(&texture_gl->t.resource); GLsizei height = wined3d_texture_get_level_pow2_height(&texture_gl->t, 0); GLsizei width = wined3d_texture_get_level_pow2_width(&texture_gl->t, 0); GLboolean standard_pattern = texture_gl->t.resource.multisample_type != WINED3D_MULTISAMPLE_NON_MASKABLE @@ -1813,7 +1781,7 @@ static void wined3d_texture_gl_prepare_rb(struct wined3d_texture_gl *texture_gl, if (texture_gl->rb_multisample) return; - samples = wined3d_texture_get_gl_sample_count(&texture_gl->t); + samples = wined3d_resource_get_sample_count(&texture_gl->t.resource); gl_info->fbo_ops.glGenRenderbuffers(1, &texture_gl->rb_multisample); gl_info->fbo_ops.glBindRenderbuffer(GL_RENDERBUFFER, texture_gl->rb_multisample); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index cc5902a..3d51a90 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3227,6 +3227,7 @@ BOOL wined3d_resource_allocate_sysmem(struct wined3d_resource *resource) DECLSPE void wined3d_resource_free_sysmem(struct wined3d_resource *resource) DECLSPEC_HIDDEN; const struct wined3d_format *wined3d_resource_get_decompress_format( const struct wined3d_resource *resource) DECLSPEC_HIDDEN; +unsigned int wined3d_resource_get_sample_count(const struct wined3d_resource *resource) DECLSPEC_HIDDEN; GLbitfield wined3d_resource_gl_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; GLenum wined3d_resource_gl_legacy_map_flags(DWORD d3d_flags) DECLSPEC_HIDDEN; BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) DECLSPEC_HIDDEN;

1 0

Józef Kucia : wined3d: Store multisample draw location in struct wined3d_d3d_info.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 05f096e783d1f6fd553a496a6a5ca825150edf70 URL: https://source.winehq.org/git/wine.git/?a=commit;h=05f096e783d1f6fd553a496a… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:22 2019 +0100 wined3d: Store multisample draw location in struct wined3d_d3d_info. We may want to introduce a separate structure for backend options if we have more of those. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 5 +++++ dlls/wined3d/resource.c | 8 +++----- dlls/wined3d/wined3d_private.h | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 086d046..492d7f9 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3738,6 +3738,11 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) + d3d_info->multisample_draw_location = WINED3D_LOCATION_TEXTURE_RGB; + else + d3d_info->multisample_draw_location = WINED3D_LOCATION_RB_MULTISAMPLE; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); if (!d3d_info->shader_color_key) diff --git a/dlls/wined3d/resource.c b/dlls/wined3d/resource.c index 90025e9..ba71df1 100644 --- a/dlls/wined3d/resource.c +++ b/dlls/wined3d/resource.c @@ -481,17 +481,15 @@ BOOL wined3d_resource_is_offscreen(struct wined3d_resource *resource) void wined3d_resource_update_draw_binding(struct wined3d_resource *resource) { + const struct wined3d_d3d_info *d3d_info = &resource->device->adapter->d3d_info; + if (!wined3d_resource_is_offscreen(resource) || wined3d_settings.offscreen_rendering_mode != ORM_FBO) { resource->draw_binding = WINED3D_LOCATION_DRAWABLE; } else if (resource->multisample_type) { - const struct wined3d_gl_info *gl_info = &resource->device->adapter->gl_info; - if (gl_info->supported[ARB_TEXTURE_MULTISAMPLE]) - resource->draw_binding = WINED3D_LOCATION_TEXTURE_RGB; - else - resource->draw_binding = WINED3D_LOCATION_RB_MULTISAMPLE; + resource->draw_binding = d3d_info->multisample_draw_location; } else if (resource->gl_type == WINED3D_GL_RES_TYPE_RB) { diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 25a74dc..cc5902a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -207,6 +207,8 @@ struct wined3d_d3d_info unsigned int texture_npot_conditional : 1; unsigned int draw_base_vertex_offset : 1; enum wined3d_feature_level feature_level; + + DWORD multisample_draw_location; }; static const struct color_fixup_desc COLOR_FIXUP_IDENTITY =

1 0

Józef Kucia : wined3d: Store base vertex draw capabilities in struct wined3d_d3d_info.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: 243f289149b02eebf505299c538f0dfaf923c552 URL: https://source.winehq.org/git/wine.git/?a=commit;h=243f289149b02eebf505299c… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:21 2019 +0100 wined3d: Store base vertex draw capabilities in struct wined3d_d3d_info. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 2 ++ dlls/wined3d/cs.c | 5 ++--- dlls/wined3d/wined3d_private.h | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 538e0c1..086d046 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3736,6 +3736,8 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->texture_npot_conditional = gl_info->supported[WINED3D_GL_NORMALIZED_TEXRECT] || gl_info->supported[ARB_TEXTURE_RECTANGLE]; + d3d_info->draw_base_vertex_offset = !!gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]; + TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); if (!d3d_info->shader_color_key) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 3de29d5..47b23de 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -842,7 +842,6 @@ void wined3d_cs_emit_dispatch_indirect(struct wined3d_cs *cs, static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_d3d_info *d3d_info = &cs->device->adapter->d3d_info; - const struct wined3d_gl_info *gl_info = &cs->device->adapter->gl_info; const struct wined3d_shader *geometry_shader; struct wined3d_device *device = cs->device; int base_vertex_idx, load_base_vertex_idx; @@ -855,14 +854,14 @@ static void wined3d_cs_exec_draw(struct wined3d_cs *cs, const void *data) { const struct wined3d_direct_draw_parameters *direct = &op->parameters.u.direct; - if (op->parameters.indexed && gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (op->parameters.indexed && d3d_info->draw_base_vertex_offset) base_vertex_idx = direct->base_vertex_idx; else if (!op->parameters.indexed) base_vertex_idx = direct->start_idx; } /* ARB_draw_indirect always supports a base vertex offset. */ - if (!op->parameters.indirect && !gl_info->supported[ARB_DRAW_ELEMENTS_BASE_VERTEX]) + if (!op->parameters.indirect && !d3d_info->draw_base_vertex_offset) load_base_vertex_idx = op->parameters.u.direct.base_vertex_idx; else load_base_vertex_idx = 0; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 125efeb..25a74dc 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; + unsigned int draw_base_vertex_offset : 1; enum wined3d_feature_level feature_level; };

1 0

Józef Kucia : wined3d: Get rid of valid_rt_mask.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: dc2233ab4d05040f1b9497c574126d642f6ede5f URL: https://source.winehq.org/git/wine.git/?a=commit;h=dc2233ab4d05040f1b9497c5… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Sun Mar 3 19:55:20 2019 +0100 wined3d: Get rid of valid_rt_mask. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 4 ---- dlls/wined3d/context.c | 9 +++++---- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index 803ebda..538e0c1 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3738,10 +3738,6 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, TRACE("Max texture stages: %u.\n", d3d_info->limits.ffp_blend_stages); - d3d_info->valid_rt_mask = 0; - for (i = 0; i < gl_info->limits.buffers; ++i) - d3d_info->valid_rt_mask |= (1u << i); - if (!d3d_info->shader_color_key) { /* We do not want to deal with re-creating immutable texture storage diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 393b336..122ed70 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3147,11 +3147,12 @@ BOOL context_apply_clear_state(struct wined3d_context *context, const struct win return TRUE; } -static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) +static unsigned int find_draw_buffers_mask(const struct wined3d_context *context, const struct wined3d_state *state) { struct wined3d_rendertarget_view * const *rts = state->fb->render_targets; struct wined3d_shader *ps = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - DWORD rt_mask, mask; + const struct wined3d_gl_info *gl_info = context->gl_info; + unsigned int rt_mask, mask; unsigned int i; if (wined3d_settings.offscreen_rendering_mode != ORM_FBO) @@ -3160,7 +3161,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const return context_generate_rt_mask_from_resource(rts[0]->resource); rt_mask = ps ? ps->reg_maps.rt_mask : 1; - rt_mask &= context->d3d_info->valid_rt_mask; + rt_mask &= (1u << gl_info->limits.buffers) - 1; mask = rt_mask; while (mask) @@ -3176,7 +3177,7 @@ static DWORD find_draw_buffers_mask(const struct wined3d_context *context, const /* Context activation is done by the caller. */ void context_state_fb(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - DWORD rt_mask = find_draw_buffers_mask(context, state); + unsigned int rt_mask = find_draw_buffers_mask(context, state); const struct wined3d_fb_state *fb = state->fb; DWORD color_location = 0; DWORD *cur_mask; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 1b70582..125efeb 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -195,7 +195,6 @@ struct wined3d_d3d_info { struct wined3d_d3d_limits limits; struct wined3d_ffp_attrib_ops ffp_attrib_ops; - DWORD valid_rt_mask; DWORD wined3d_creation_flags; unsigned int xyzrhw : 1; unsigned int emulated_flatshading : 1;

1 0

Nikolay Sivov : mfplat: Implement media type handler functionality for stream descriptor.
by Alexandre Julliard 04 Mar '19

04 Mar '19

Module: wine Branch: master Commit: bc55b6fdaf8f8624d4686f2f7b72f398f7dd8da2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bc55b6fdaf8f8624d4686f2f… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Mar 4 13:33:49 2019 +0300 mfplat: Implement media type handler functionality for stream descriptor. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mfplat/main.c | 1 - dlls/mfplat/mediatype.c | 90 +++++++++++++++++++++++++++++++++++++++----- dlls/mfplat/mfplat_private.h | 1 + dlls/mfplat/queue.c | 2 - 4 files changed, 82 insertions(+), 12 deletions(-) diff --git a/dlls/mfplat/main.c b/dlls/mfplat/main.c index 743d5bd..2217f3f 100644 --- a/dlls/mfplat/main.c +++ b/dlls/mfplat/main.c @@ -28,7 +28,6 @@ #include "winreg.h" #include "initguid.h" -#include "mferror.h" #include "wine/heap.h" #include "wine/debug.h" diff --git a/dlls/mfplat/mediatype.c b/dlls/mfplat/mediatype.c index 1bd32cd..a473c75 100644 --- a/dlls/mfplat/mediatype.c +++ b/dlls/mfplat/mediatype.c @@ -37,6 +37,10 @@ struct stream_desc IMFStreamDescriptor IMFStreamDescriptor_iface; IMFMediaTypeHandler IMFMediaTypeHandler_iface; DWORD identifier; + IMFMediaType **media_types; + unsigned int media_types_count; + IMFMediaType *current_type; + CRITICAL_SECTION cs; }; static inline struct media_type *impl_from_IMFMediaType(IMFMediaType *iface) @@ -416,11 +420,21 @@ static ULONG WINAPI stream_descriptor_Release(IMFStreamDescriptor *iface) { struct stream_desc *stream_desc = impl_from_IMFStreamDescriptor(iface); ULONG refcount = InterlockedDecrement(&stream_desc->attributes.ref); + unsigned int i; TRACE("%p, refcount %u.\n", iface, refcount); if (!refcount) { + for (i = 0; i < stream_desc->media_types_count; ++i) + { + if (stream_desc->media_types[i]) + IMFMediaType_Release(stream_desc->media_types[i]); + } + heap_free(stream_desc->media_types); + if (stream_desc->current_type) + IMFMediaType_Release(stream_desc->current_type); + DeleteCriticalSection(&stream_desc->cs); heap_free(stream_desc); } @@ -715,31 +729,71 @@ static HRESULT WINAPI mediatype_handler_IsMediaTypeSupported(IMFMediaTypeHandler static HRESULT WINAPI mediatype_handler_GetMediaTypeCount(IMFMediaTypeHandler *iface, DWORD *count) { - FIXME("%p, %p.\n", iface, count); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, count); + + *count = stream_desc->media_types_count; + + return S_OK; } static HRESULT WINAPI mediatype_handler_GetMediaTypeByIndex(IMFMediaTypeHandler *iface, DWORD index, IMFMediaType **type) { - FIXME("%p, %u, %p.\n", iface, index, type); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %u, %p.\n", iface, index, type); + + if (index >= stream_desc->media_types_count) + return MF_E_NO_MORE_TYPES; + + if (stream_desc->media_types[index]) + { + *type = stream_desc->media_types[index]; + IMFMediaType_AddRef(*type); + } + + return stream_desc->media_types[index] ? S_OK : E_FAIL; } static HRESULT WINAPI mediatype_handler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type) { - FIXME("%p, %p.\n", iface, type); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + if (!type) + return E_POINTER; + + EnterCriticalSection(&stream_desc->cs); + if (stream_desc->current_type) + IMFMediaType_Release(stream_desc->current_type); + stream_desc->current_type = type; + IMFMediaType_AddRef(stream_desc->current_type); + LeaveCriticalSection(&stream_desc->cs); + + return S_OK; } static HRESULT WINAPI mediatype_handler_GetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType **type) { - FIXME("%p, %p.\n", iface, type); + struct stream_desc *stream_desc = impl_from_IMFMediaTypeHandler(iface); + HRESULT hr = S_OK; - return E_NOTIMPL; + TRACE("%p, %p.\n", iface, type); + + EnterCriticalSection(&stream_desc->cs); + if (stream_desc->current_type) + { + *type = stream_desc->current_type; + IMFMediaType_AddRef(*type); + } + else + hr = MF_E_NOT_INITIALIZED; + LeaveCriticalSection(&stream_desc->cs); + + return hr; } static HRESULT WINAPI mediatype_handler_GetMajorType(IMFMediaTypeHandler *iface, GUID *type) @@ -769,10 +823,14 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, IMFMediaType **types, IMFStreamDescriptor **descriptor) { struct stream_desc *object; + unsigned int i; TRACE("%d, %d, %p, %p.\n", identifier, count, types, descriptor); - object = heap_alloc(sizeof(*object)); + if (!count) + return E_INVALIDARG; + + object = heap_alloc_zero(sizeof(*object)); if (!object) return E_OUTOFMEMORY; @@ -780,6 +838,20 @@ HRESULT WINAPI MFCreateStreamDescriptor(DWORD identifier, DWORD count, object->IMFStreamDescriptor_iface.lpVtbl = &streamdescriptorvtbl; object->IMFMediaTypeHandler_iface.lpVtbl = &mediatypehandlervtbl; object->identifier = identifier; + object->media_types = heap_alloc(count * sizeof(*object->media_types)); + if (!object->media_types) + { + heap_free(object); + return E_OUTOFMEMORY; + } + for (i = 0; i < count; ++i) + { + object->media_types[i] = types[i]; + if (object->media_types[i]) + IMFMediaType_AddRef(object->media_types[i]); + } + object->media_types_count = count; + InitializeCriticalSection(&object->cs); *descriptor = &object->IMFStreamDescriptor_iface; diff --git a/dlls/mfplat/mfplat_private.h b/dlls/mfplat/mfplat_private.h index 46320bb..e5b0647 100644 --- a/dlls/mfplat/mfplat_private.h +++ b/dlls/mfplat/mfplat_private.h @@ -18,6 +18,7 @@ #include "mfapi.h" #include "mfidl.h" +#include "mferror.h" typedef struct attributes { diff --git a/dlls/mfplat/queue.c b/dlls/mfplat/queue.c index 0382b02..4d33228 100644 --- a/dlls/mfplat/queue.c +++ b/dlls/mfplat/queue.c @@ -20,8 +20,6 @@ #define COBJMACROS -#include "mferror.h" - #include "wine/debug.h" #include "wine/heap.h" #include "wine/list.h"

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 March 2019