May 2019 - Wine-Commits - list.winehq.org

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers().
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 167a0f573831d14dbc7c49cfb8e313aa243a2844 URL: https://source.winehq.org/git/wine.git/?a=commit;h=167a0f573831d14dbc7c49cf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:22 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_vsamplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 936ad5b..e6b4503 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3391,13 +3391,13 @@ static BOOL context_unit_free_for_vs(const struct wined3d_context *context, return TRUE; } -static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, const struct wined3d_state *state) +static void wined3d_context_gl_map_vsamplers(struct wined3d_context_gl *context_gl, + BOOL ps, const struct wined3d_state *state) { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; - const struct wined3d_gl_info *gl_info = context->gl_info; + const struct wined3d_gl_info *gl_info = context_gl->c.gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; int i; @@ -3414,12 +3414,12 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { while (start >= 0) { - if (context_unit_free_for_vs(context, ps_resource_info, start)) + if (context_unit_free_for_vs(&context_gl->c, ps_resource_info, start)) { - if (context->tex_unit_map[vsampler_idx] != start) + if (context_gl->c.tex_unit_map[vsampler_idx] != start) { wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); - context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(vsampler_idx)); } --start; @@ -3428,7 +3428,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons --start; } - if (context->tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) + if (context_gl->c.tex_unit_map[vsampler_idx] == WINED3D_UNMAPPED_STAGE) WARN("Couldn't find a free texture unit for vertex sampler %u.\n", i); } } @@ -3458,7 +3458,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) - context_map_vsamplers(context, ps, state); + wined3d_context_gl_map_vsamplers(context_gl, ps, state); } /* Context activation is done by the caller. */

1 0

Piotr Caban : hidclass.sys: Fill some reserved fields when building HIDP_{BUTTON, VALUE}_CAPS.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 24b0faaf4183260e44609605f84b234c270b7740 URL: https://source.winehq.org/git/wine.git/?a=commit;h=24b0faaf4183260e44609605… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Fri May 10 13:35:32 2019 +0200 hidclass.sys: Fill some reserved fields when building HIDP_{BUTTON,VALUE}_CAPS. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Aric Stewart <aric(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/hidclass.sys/descriptor.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dlls/hidclass.sys/descriptor.c b/dlls/hidclass.sys/descriptor.c index 4686b71..88d28e3 100644 --- a/dlls/hidclass.sys/descriptor.c +++ b/dlls/hidclass.sys/descriptor.c @@ -739,9 +739,13 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature *bitOffset = *bitOffset + 1; wine_element->bitCount = 1; wine_element->caps.button.u.NotRange.Usage = feature->caps.u.NotRange.Usage[i]; + wine_element->caps.button.u.NotRange.Reserved1 = feature->caps.u.NotRange.Usage[i]; wine_element->caps.button.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; + wine_element->caps.button.u.NotRange.Reserved2 = feature->caps.u.NotRange.StringIndex; wine_element->caps.button.u.NotRange.DesignatorIndex = feature->caps.u.NotRange.DesignatorIndex; + wine_element->caps.button.u.NotRange.Reserved3 = feature->caps.u.NotRange.DesignatorIndex; wine_element->caps.button.u.NotRange.DataIndex = *data_index; + wine_element->caps.button.u.NotRange.Reserved4 = *data_index; *data_index = *data_index + 1; } } @@ -796,9 +800,13 @@ static void build_elements(WINE_HID_REPORT *wine_report, struct feature* feature else { wine_element->caps.value.u.NotRange.Usage = feature->caps.u.NotRange.Usage[i]; + wine_element->caps.value.u.NotRange.Reserved1 = feature->caps.u.NotRange.Usage[i]; wine_element->caps.value.u.NotRange.StringIndex = feature->caps.u.NotRange.StringIndex; + wine_element->caps.value.u.NotRange.Reserved2 = feature->caps.u.NotRange.StringIndex; wine_element->caps.value.u.NotRange.DesignatorIndex = feature->caps.u.NotRange.DesignatorIndex; + wine_element->caps.value.u.NotRange.Reserved3 = feature->caps.u.NotRange.DesignatorIndex; wine_element->caps.value.u.NotRange.DataIndex = *data_index; + wine_element->caps.value.u.NotRange.Reserved4 = *data_index; *data_index = *data_index + 1; } }

1 0

Alistair Leslie-Hughes : mspatcha/tests: Make functions static.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 480054b6193bb54c1646e839773717df5ab9b10e URL: https://source.winehq.org/git/wine.git/?a=commit;h=480054b6193bb54c1646e839… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu May 9 23:54:55 2019 +0000 mspatcha/tests: Make functions static. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mspatcha/tests/apply_patch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/mspatcha/tests/apply_patch.c b/dlls/mspatcha/tests/apply_patch.c index 0e0409e..dae09c3 100644 --- a/dlls/mspatcha/tests/apply_patch.c +++ b/dlls/mspatcha/tests/apply_patch.c @@ -319,7 +319,7 @@ static BOOL CALLBACK progress_cancel(void *context, ULONG current, ULONG max) return FALSE; } -BOOL create_temp_file(const BYTE *buf, size_t size, const char *temppath, char *tempname) +static BOOL create_temp_file(const BYTE *buf, size_t size, const char *temppath, char *tempname) { HANDLE hndl; DWORD written; @@ -334,14 +334,14 @@ BOOL create_temp_file(const BYTE *buf, size_t size, const char *temppath, char * return b && written == size; } -void delete_test_files(void) +static void delete_test_files(void) { size_t i; for (i = 0; test_files[i].buf != NULL; ++i) DeleteFileA(test_files[i].name); } -BOOL setup_test_files(void) +static BOOL setup_test_files(void) { char temppath[MAX_PATH]; size_t i;

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_psamplers().
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 1d0f83711d9462a8054a7556eb80d66fed3ddaf0 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1d0f83711d9462a8054a7556… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:21 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_psamplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 2758619..936ad5b 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3346,22 +3346,21 @@ static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_contex } } -static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) +static void wined3d_context_gl_map_psamplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; unsigned int i; for (i = 0; i < WINED3D_MAX_FRAGMENT_SAMPLERS; ++i) { - if (resource_info[i].type && context->tex_unit_map[i] != i) + if (resource_info[i].type && context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) - context_invalidate_texture_stage(context, i); + context_invalidate_texture_stage(&context_gl->c, i); } } } @@ -3454,7 +3453,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s return; if (ps) - context_map_psamplers(context, state); + wined3d_context_gl_map_psamplers(context_gl, state); else wined3d_context_gl_map_fixed_function_samplers(context_gl, state);

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers ().
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: e6ad0cd7e351c503a8cbd046b192041eaa2e503f URL: https://source.winehq.org/git/wine.git/?a=commit;h=e6ad0cd7e351c503a8cbd046… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:20 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_fixed_function_samplers(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9146b81..2758619 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3301,29 +3301,28 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont } } -static void context_map_fixed_function_samplers(struct wined3d_context *context, +static void wined3d_context_gl_map_fixed_function_samplers(struct wined3d_context_gl *context_gl, const struct wined3d_state *state) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(context); - const struct wined3d_d3d_info *d3d_info = context->d3d_info; + const struct wined3d_d3d_info *d3d_info = context_gl->c.d3d_info; unsigned int i, tex; WORD ffu_map; - ffu_map = context->fixed_function_usage_map; + ffu_map = context_gl->c.fixed_function_usage_map; if (d3d_info->limits.ffp_textures == d3d_info->limits.ffp_blend_stages - || context->lowest_disabled_stage <= d3d_info->limits.ffp_textures) + || context_gl->c.lowest_disabled_stage <= d3d_info->limits.ffp_textures) { for (i = 0; ffu_map; ffu_map >>= 1, ++i) { if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != i) + if (context_gl->c.tex_unit_map[i] != i) { wined3d_context_gl_map_stage(context_gl, i, i); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } } return; @@ -3336,11 +3335,11 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (!(ffu_map & 1)) continue; - if (context->tex_unit_map[i] != tex) + if (context_gl->c.tex_unit_map[i] != tex) { wined3d_context_gl_map_stage(context_gl, i, tex); - context_invalidate_state(context, STATE_SAMPLER(i)); - context_invalidate_texture_stage(context, i); + context_invalidate_state(&context_gl->c, STATE_SAMPLER(i)); + context_invalidate_texture_stage(&context_gl->c, i); } ++tex; @@ -3438,6 +3437,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons static void context_update_tex_unit_map(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_gl_info *gl_info = context->gl_info; BOOL vs = use_vs(state); BOOL ps = use_ps(state); @@ -3456,7 +3456,7 @@ static void context_update_tex_unit_map(struct wined3d_context *context, const s if (ps) context_map_psamplers(context, state); else - context_map_fixed_function_samplers(context, state); + wined3d_context_gl_map_fixed_function_samplers(context_gl, state); if (vs) context_map_vsamplers(context, ps, state);

1 0

Julian Rüger : po: Update German translation.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 378324f551a07541b2c16cb607d6410eb6c36ca8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=378324f551a07541b2c16cb6… Author: Julian Rüger <jr98(a)gmx.net> Date: Fri May 10 10:56:01 2019 +0200 po: Update German translation. Signed-off-by: Julian Rüger <jr98(a)gmx.net> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- po/de.po | 370 +++++++++++++++------------------------------------------------ 1 file changed, 89 insertions(+), 281 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=378324f551a07541b2c1…

1 0

Bryon Roche : windowscodecs: Byte swap png read/write for 16-bpp data.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 0c0def962f2b86f44625f11d8d9d2013aaffa46a URL: https://source.winehq.org/git/wine.git/?a=commit;h=0c0def962f2b86f44625f11d… Author: Bryon Roche <kain(a)kain.org> Date: Thu May 9 15:30:42 2019 -0500 windowscodecs: Byte swap png read/write for 16-bpp data. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46558 Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/windowscodecs/pngformat.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/windowscodecs/pngformat.c b/dlls/windowscodecs/pngformat.c index db0fa9e..c0e272e 100644 --- a/dlls/windowscodecs/pngformat.c +++ b/dlls/windowscodecs/pngformat.c @@ -332,6 +332,7 @@ MAKE_FUNCPTR(png_set_strip_16); MAKE_FUNCPTR(png_set_tRNS); MAKE_FUNCPTR(png_set_tRNS_to_alpha); MAKE_FUNCPTR(png_set_write_fn); +MAKE_FUNCPTR(png_set_swap); MAKE_FUNCPTR(png_read_end); MAKE_FUNCPTR(png_read_image); MAKE_FUNCPTR(png_read_info); @@ -398,6 +399,7 @@ static void *load_libpng(void) LOAD_FUNCPTR(png_set_tRNS); LOAD_FUNCPTR(png_set_tRNS_to_alpha); LOAD_FUNCPTR(png_set_write_fn); + LOAD_FUNCPTR(png_set_swap); LOAD_FUNCPTR(png_read_end); LOAD_FUNCPTR(png_read_image); LOAD_FUNCPTR(png_read_info); @@ -642,6 +644,10 @@ static HRESULT WINAPI PngDecoder_Initialize(IWICBitmapDecoder *iface, IStream *p color_type = ppng_get_color_type(This->png_ptr, This->info_ptr); bit_depth = ppng_get_bit_depth(This->png_ptr, This->info_ptr); + /* PNGs with bit-depth greater than 8 are network byte order. Windows does not expect this. */ + if (bit_depth > 8) + ppng_set_swap(This->png_ptr); + /* check for color-keyed alpha */ transparency = ppng_get_tRNS(This->png_ptr, This->info_ptr, &trans, &num_trans, &trans_values); @@ -1643,6 +1649,10 @@ static HRESULT WINAPI PngFrameEncode_WritePixels(IWICBitmapFrameEncode *iface, } } + /* Tell PNG we need to byte swap if writing a >8-bpp image */ + if (This->format->bit_depth > 8) + ppng_set_swap(This->png_ptr); + ppng_set_IHDR(This->png_ptr, This->info_ptr, This->width, This->height, This->format->bit_depth, This->format->color_type, This->interlace ? PNG_INTERLACE_ADAM7 : PNG_INTERLACE_NONE,

1 0

Francois Gouget : jscript: Make the Enumerator_props functions static.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: cfcb7b7473d189f2a355ca33747cc60698fdf756 URL: https://source.winehq.org/git/wine.git/?a=commit;h=cfcb7b7473d189f2a355ca33… Author: Francois Gouget <fgouget(a)free.fr> Date: Thu May 9 10:59:39 2019 +0200 jscript: Make the Enumerator_props functions static. Signed-off-by: Francois Gouget <fgouget(a)free.fr> Signed-off-by: Jacek Caban<jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/jscript/enumerator.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dlls/jscript/enumerator.c b/dlls/jscript/enumerator.c index aa7737a..d0502f6 100644 --- a/dlls/jscript/enumerator.c +++ b/dlls/jscript/enumerator.c @@ -40,7 +40,7 @@ static void Enumerator_destructor(jsdisp_t *dispex) heap_free(dispex); } -HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_atEnd\n"); @@ -48,7 +48,7 @@ HRESULT Enumerator_atEnd(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigne return E_NOTIMPL; } -HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_item\n"); @@ -56,7 +56,7 @@ HRESULT Enumerator_item(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned return E_NOTIMPL; } -HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveFirst\n"); @@ -64,7 +64,7 @@ HRESULT Enumerator_moveFirst(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, uns return E_NOTIMPL; } -HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, +static HRESULT Enumerator_moveNext(script_ctx_t *ctx, vdisp_t *jsthis, WORD flags, unsigned argc, jsval_t *argv, jsval_t *r) { TRACE("Enumerator_moveNext\n");

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_map_stage().
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: be7f65dfdc0ab881ca46c4d7945ebfdd934bfcbc URL: https://source.winehq.org/git/wine.git/?a=commit;h=be7f65dfdc0ab881ca46c4d7… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu May 9 23:56:19 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_map_stage(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index cf164d5..9146b81 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3224,19 +3224,19 @@ void context_state_fb(struct wined3d_context *context, const struct wined3d_stat context->constant_update_mask |= WINED3D_SHADER_CONST_PS_Y_CORR; } -static void context_map_stage(struct wined3d_context *context, DWORD stage, DWORD unit) +static void wined3d_context_gl_map_stage(struct wined3d_context_gl *context_gl, unsigned int stage, unsigned int unit) { - DWORD i = context->rev_tex_unit_map[unit]; - DWORD j = context->tex_unit_map[stage]; + unsigned int i = context_gl->c.rev_tex_unit_map[unit]; + unsigned int j = context_gl->c.tex_unit_map[stage]; TRACE("Mapping stage %u to unit %u.\n", stage, unit); - context->tex_unit_map[stage] = unit; + context_gl->c.tex_unit_map[stage] = unit; if (i != WINED3D_UNMAPPED_STAGE && i != stage) - context->tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; + context_gl->c.tex_unit_map[i] = WINED3D_UNMAPPED_STAGE; - context->rev_tex_unit_map[unit] = stage; + context_gl->c.rev_tex_unit_map[unit] = stage; if (j != WINED3D_UNMAPPED_STAGE && j != unit) - context->rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; + context_gl->c.rev_tex_unit_map[j] = WINED3D_UNMAPPED_STAGE; } static void context_invalidate_texture_stage(struct wined3d_context *context, DWORD stage) @@ -3304,6 +3304,7 @@ static void context_update_fixed_function_usage_map(struct wined3d_context *cont static void context_map_fixed_function_samplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; unsigned int i, tex; WORD ffu_map; @@ -3320,7 +3321,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3337,7 +3338,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, if (context->tex_unit_map[i] != tex) { - context_map_stage(context, i, tex); + wined3d_context_gl_map_stage(context_gl, i, tex); context_invalidate_state(context, STATE_SAMPLER(i)); context_invalidate_texture_stage(context, i); } @@ -3348,6 +3349,7 @@ static void context_map_fixed_function_samplers(struct wined3d_context *context, static void context_map_psamplers(struct wined3d_context *context, const struct wined3d_state *state) { + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_d3d_info *d3d_info = context->d3d_info; const struct wined3d_shader_resource_info *resource_info = state->shader[WINED3D_SHADER_TYPE_PIXEL]->reg_maps.resource_info; @@ -3357,7 +3359,7 @@ static void context_map_psamplers(struct wined3d_context *context, const struct { if (resource_info[i].type && context->tex_unit_map[i] != i) { - context_map_stage(context, i, i); + wined3d_context_gl_map_stage(context_gl, i, i); context_invalidate_state(context, STATE_SAMPLER(i)); if (i < d3d_info->limits.ffp_blend_stages) context_invalidate_texture_stage(context, i); @@ -3395,6 +3397,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { const struct wined3d_shader_resource_info *vs_resource_info = state->shader[WINED3D_SHADER_TYPE_VERTEX]->reg_maps.resource_info; + struct wined3d_context_gl *context_gl = wined3d_context_gl(context); const struct wined3d_shader_resource_info *ps_resource_info = NULL; const struct wined3d_gl_info *gl_info = context->gl_info; int start = min(WINED3D_MAX_COMBINED_SAMPLERS, gl_info->limits.graphics_samplers) - 1; @@ -3417,7 +3420,7 @@ static void context_map_vsamplers(struct wined3d_context *context, BOOL ps, cons { if (context->tex_unit_map[vsampler_idx] != start) { - context_map_stage(context, vsampler_idx, start); + wined3d_context_gl_map_stage(context_gl, vsampler_idx, start); context_invalidate_state(context, STATE_SAMPLER(vsampler_idx)); }

1 0

Zebediah Figura : strmbase: Get rid of the "pfnGetMediaTypeVersion" callback.
by Alexandre Julliard May 10, 2019

May 10, 2019

Module: wine Branch: master Commit: 9be7995448706231fd7542632943fc7cf2bf3108 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9be7995448706231fd754263… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 9 10:12:34 2019 -0500 strmbase: Get rid of the "pfnGetMediaTypeVersion" callback. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/amstream/mediastream.c | 12 ------------ dlls/qcap/avico.c | 13 ------------- dlls/qcap/avimux.c | 12 ------------ dlls/qcap/smartteefilter.c | 22 ---------------------- dlls/qcap/vfwcapture.c | 6 ------ dlls/quartz/filesource.c | 1 - dlls/quartz/parser.c | 1 - dlls/strmbase/pin.c | 11 +++++------ dlls/strmbase/renderer.c | 1 - dlls/strmbase/transform.c | 2 -- dlls/winegstreamer/gstdemux.c | 1 - dlls/wineqtdecoder/qtsplitter.c | 1 - include/wine/strmbase.h | 1 - 13 files changed, 5 insertions(+), 79 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=9be7995448706231fd75…

1 0