wine-commits August 2019

wine-commits@winehq.org

2 participants
703 discussions

Zebediah Figura : wineqtdecoder: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 0e55edaac5314ced74142a128ac1b8f38e02a01d URL: https://source.winehq.org/git/wine.git/?a=commit;h=0e55edaac5314ced74142a12… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:57 2019 -0500 wineqtdecoder: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wineqtdecoder/Makefile.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/wineqtdecoder/Makefile.in b/dlls/wineqtdecoder/Makefile.in index c49d3f6..1b97740 100644 --- a/dlls/wineqtdecoder/Makefile.in +++ b/dlls/wineqtdecoder/Makefile.in @@ -1,13 +1,22 @@ MODULE = wineqtdecoder.dll -IMPORTS = strmiids strmbase uuid ole32 advapi32 +IMPORTS = strmiids uuid ole32 advapi32 EXTRALIBS = $(QUICKTIME_LIBS) +PARENTSRC = ../strmbase C_SRCS = \ + dllfunc.c \ + enumpins.c \ + filter.c \ main.c \ + mediatype.c \ + pin.c \ qtdatahandler.c \ qtsplitter.c \ qtutils.c \ - qtvdecoder.c + qtvdecoder.c \ + qualitycontrol.c \ + seeking.c \ + transform.c RC_SRCS = \ rsrc.rc

1 0

Zebediah Figura : winegstreamer: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: abdaa6f21f672c882ab60583d822789154cefecf URL: https://source.winehq.org/git/wine.git/?a=commit;h=abdaa6f21f672c882ab60583… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:56 2019 -0500 winegstreamer: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/winegstreamer/Makefile.in | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/dlls/winegstreamer/Makefile.in b/dlls/winegstreamer/Makefile.in index 437915f..08adb2b 100644 --- a/dlls/winegstreamer/Makefile.in +++ b/dlls/winegstreamer/Makefile.in @@ -1,14 +1,23 @@ MODULE = winegstreamer.dll -IMPORTS = strmbase strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid +IMPORTS = strmiids uuid winmm msacm32 msvfw32 ole32 oleaut32 user32 gdi32 advapi32 mfplat mfuuid EXTRAINCL = $(GSTREAMER_CFLAGS) EXTRALIBS = $(GSTREAMER_LIBS) $(PTHREAD_LIBS) +PARENTSRC = ../strmbase C_SRCS = \ + dllfunc.c \ + enumpins.c \ + filter.c \ gst_cbs.c \ gstdemux.c \ gsttffilter.c \ main.c \ - mfplat.c + mediatype.c \ + mfplat.c \ + pin.c \ + qualitycontrol.c \ + seeking.c \ + transform.c IDL_SRCS = mfplat.idl

1 0

Zebediah Figura : qcap: Share source with strmbase.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 4c2c98934154e2587348d45b1d4b05e66f253830 URL: https://source.winehq.org/git/wine.git/?a=commit;h=4c2c98934154e2587348d45b… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Mon Aug 5 10:25:55 2019 -0500 qcap: Share source with strmbase. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/qcap/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/dlls/qcap/Makefile.in b/dlls/qcap/Makefile.in index e161e06..12cc917 100644 --- a/dlls/qcap/Makefile.in +++ b/dlls/qcap/Makefile.in @@ -1,13 +1,19 @@ MODULE = qcap.dll -IMPORTS = strmiids strmbase uuid ole32 oleaut32 gdi32 advapi32 +IMPORTS = strmiids uuid ole32 oleaut32 gdi32 advapi32 DELAYIMPORTS = msvfw32 +PARENTSRC = ../strmbase C_SRCS = \ audiorecord.c \ avico.c \ avimux.c \ capturegraph.c \ + dllfunc.c \ enummedia.c \ + enumpins.c \ + filter.c \ + mediatype.c \ + pin.c \ qcap_main.c \ smartteefilter.c \ v4l.c \

1 0

Nikolay Sivov : dwrite: Add recent script properties.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: cd7dd5e8959fb5190d1417d9033be9d009169b6a URL: https://source.winehq.org/git/wine.git/?a=commit;h=cd7dd5e8959fb5190d1417d9… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Aug 5 13:59:02 2019 +0300 dwrite: Add recent script properties. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dwrite/analyzer.c | 7 +++++++ dlls/dwrite/scripts.h | 9 ++++++++- tools/make_unicode | 8 ++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) diff --git a/dlls/dwrite/analyzer.c b/dlls/dwrite/analyzer.c index 8e58e61..7fc955e 100644 --- a/dlls/dwrite/analyzer.c +++ b/dlls/dwrite/analyzer.c @@ -187,6 +187,13 @@ static const struct dwritescript_properties dwritescripts_properties[Script_Last { /* Nshu */ { 0x7568734e, 499, 1, 0x0020, 0, 0, 1, 1, 0, 0, 0 }, { _OT('n','s','h','u') } }, { /* Soyo */ { 0x6f796f53, 329, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','y','o') } }, { /* Zanb */ { 0x626e615a, 339, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('z','a','n','b') } }, + { /* Dogr */ { 0x72676f44, 328, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('d','o','g','r') } }, + { /* Gong */ { 0x676e6f47, 312, 8, 0x0020, 1, 1, 0, 0, 0, 1, 0 }, { _OT('g','o','n','g') } }, + { /* Rohg */ { 0x67686f52, 167, 8, 0x0020, 0, 1, 0, 0, 0, 1, 1 }, { _OT('r','o','h','g') } }, + { /* Maka */ { 0x616b614d, 366, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','a','k','a') } }, + { /* Medf */ { 0x6664654d, 265, 8, 0x0020, 0, 1, 1, 0, 0, 0, 0 }, { _OT('m','e','d','f') } }, + { /* Sogo */ { 0x6f676f53, 142, 8, 0x0020, 1, 1, 1, 0, 0, 0, 0 }, { _OT('s','o','g','o') } }, + { /* Sogd */ { 0x64676f53, 141, 8, 0x0020, 1, 1, 0, 0, 0, 1, 1 }, { _OT('s','o','g','d') } }, }; #undef _OT diff --git a/dlls/dwrite/scripts.h b/dlls/dwrite/scripts.h index ebf97f3..b3cc8fc 100644 --- a/dlls/dwrite/scripts.h +++ b/dlls/dwrite/scripts.h @@ -145,5 +145,12 @@ enum unicode_script_id { Script_Nushu = 139, Script_Soyombo = 140, Script_Zanabazar_Square = 141, - Script_LastId = 141 + Script_Dogra = 142, + Script_Gunjala_Gondi = 143, + Script_Hanifi_Rohingya = 144, + Script_Makasar = 145, + Script_Medefaidrin = 146, + Script_Old_Sogdian = 147, + Script_Sogdian = 148, + Script_LastId = 148 }; diff --git a/tools/make_unicode b/tools/make_unicode index 4b79668..8f99be2 100755 --- a/tools/make_unicode +++ b/tools/make_unicode @@ -1547,6 +1547,14 @@ my %scripts = "Nushu" => 139, "Soyombo" => 140, "Zanabazar_Square" => 141, + # Win10 1903 + "Dogra" => 142, + "Gunjala_Gondi" => 143, + "Hanifi_Rohingya" => 144, + "Makasar" => 145, + "Medefaidrin" => 146, + "Old_Sogdian" => 147, + "Sogdian" => 148, ); ################################################################

1 0

Henri Verbeet : wined3d: Use d3d_info to determine whether shader outputs need interpolation qualifiers.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 4f86e35c53875d56e8ba69b6270dd4f638e9d3fb URL: https://source.winehq.org/git/wine.git/?a=commit;h=4f86e35c53875d56e8ba69b6… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:58 2019 +0430 wined3d: Use d3d_info to determine whether shader outputs need interpolation qualifiers. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 1 + dlls/wined3d/glsl_shader.c | 10 ++++++++++ dlls/wined3d/shader.c | 15 ++++++--------- dlls/wined3d/wined3d_private.h | 17 +++++------------ 4 files changed, 22 insertions(+), 21 deletions(-) diff --git a/dlls/wined3d/adapter_gl.c b/dlls/wined3d/adapter_gl.c index a0167f0..5f6d673 100644 --- a/dlls/wined3d/adapter_gl.c +++ b/dlls/wined3d/adapter_gl.c @@ -3770,6 +3770,7 @@ static BOOL wined3d_adapter_init_gl_caps(struct wined3d_adapter *adapter, d3d_info->limits.ps_uniform_count = shader_caps.ps_uniform_count; d3d_info->limits.varying_count = shader_caps.varying_count; d3d_info->shader_double_precision = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_DOUBLE_PRECISION); + d3d_info->shader_output_interpolation = !!(shader_caps.wined3d_caps & WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION); d3d_info->viewport_array_index_any_shader = !!gl_info->supported[ARB_SHADER_VIEWPORT_LAYER_ARRAY]; diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 1acb6c7..41cf157 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -1979,6 +1979,14 @@ static void shader_glsl_declare_shader_inputs(const struct wined3d_gl_info *gl_i } } +static BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) +{ + /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in + * fragment shaders. In older GLSL versions interpolation qualifiers must + * match between shader stages. */ + return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); +} + static void shader_glsl_declare_shader_outputs(const struct wined3d_gl_info *gl_info, struct wined3d_string_buffer *buffer, unsigned int element_count, BOOL rasterizer_setup, const DWORD *interpolation_mode) @@ -11108,6 +11116,8 @@ static void shader_glsl_get_caps(const struct wined3d_adapter *adapter, struct s * shader_glsl_alloc(). */ caps->wined3d_caps = WINED3D_SHADER_CAP_VS_CLIPPING | WINED3D_SHADER_CAP_SRGB_WRITE; + if (needs_interpolation_qualifiers_for_shader_outputs(gl_info)) + caps->wined3d_caps |= WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION; } static BOOL shader_glsl_color_fixup_supported(struct color_fixup_desc fixup) diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index 973941b..1d8540e 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -3505,10 +3505,10 @@ HRESULT CDECL wined3d_shader_set_local_constants_float(struct wined3d_shader *sh } static void init_interpolation_compile_args(DWORD *interpolation_args, - const struct wined3d_shader *pixel_shader, const struct wined3d_gl_info *gl_info) + const struct wined3d_shader *pixel_shader, const struct wined3d_d3d_info *d3d_info) { - if (!needs_interpolation_qualifiers_for_shader_outputs(gl_info) - || !pixel_shader || pixel_shader->reg_maps.shader_version.major < 4) + if (!d3d_info->shader_output_interpolation || !pixel_shader + || pixel_shader->reg_maps.shader_version.major < 4) { memset(interpolation_args, 0, sizeof(pixel_shader->u.ps.interpolation_mode)); return; @@ -3525,7 +3525,6 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; args->fog_src = state->render_states[WINED3D_RS_FOGTABLEMODE] == WINED3D_FOG_NONE ? VS_FOG_COORD : VS_FOG_Z; @@ -3548,7 +3547,7 @@ void find_vs_compile_args(const struct wined3d_state *state, const struct wined3 args->flatshading = 0; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, d3d_info); } static BOOL match_usage(BYTE usage1, BYTE usage_idx1, BYTE usage2, BYTE usage_idx2) @@ -3865,7 +3864,6 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 const struct wined3d_shader *geometry_shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; const struct wined3d_shader *hull_shader = state->shader[WINED3D_SHADER_TYPE_HULL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->tessellator_output_primitive = hull_shader->u.hs.tessellator_output_primitive; args->tessellator_partitioning = hull_shader->u.hs.tessellator_partitioning; @@ -3877,7 +3875,7 @@ void find_ds_compile_args(const struct wined3d_state *state, const struct wined3 args->render_offscreen = context->render_offscreen; init_interpolation_compile_args(args->interpolation_mode, - args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, gl_info); + args->next_shader_type == WINED3D_SHADER_TYPE_PIXEL ? pixel_shader : NULL, context->d3d_info); args->padding = 0; } @@ -3886,14 +3884,13 @@ void find_gs_compile_args(const struct wined3d_state *state, const struct wined3 struct gs_compile_args *args, const struct wined3d_context *context) { const struct wined3d_shader *pixel_shader = state->shader[WINED3D_SHADER_TYPE_PIXEL]; - const struct wined3d_gl_info *gl_info = context->gl_info; args->output_count = pixel_shader ? pixel_shader->limits->packed_input : shader->limits->packed_output; if (!(args->primitive_type = shader->u.gs.input_type)) args->primitive_type = d3d_primitive_type_from_gl(state->gl_primitive_type); - init_interpolation_compile_args(args->interpolation_mode, pixel_shader, gl_info); + init_interpolation_compile_args(args->interpolation_mode, pixel_shader, context->d3d_info); } void find_ps_compile_args(const struct wined3d_state *state, const struct wined3d_shader *shader, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 0394ba6..fd68cbd 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -205,6 +205,7 @@ struct wined3d_d3d_info unsigned int vs_clipping : 1; unsigned int shader_color_key : 1; unsigned int shader_double_precision : 1; + unsigned int shader_output_interpolation : 1; unsigned int viewport_array_index_any_shader : 1; unsigned int texture_npot : 1; unsigned int texture_npot_conditional : 1; @@ -1298,9 +1299,10 @@ BOOL shader_get_stream_output_register_info(const struct wined3d_shader *shader, typedef void (*SHADER_HANDLER)(const struct wined3d_shader_instruction *); -#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001 -#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002 -#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004 +#define WINED3D_SHADER_CAP_VS_CLIPPING 0x00000001u +#define WINED3D_SHADER_CAP_SRGB_WRITE 0x00000002u +#define WINED3D_SHADER_CAP_DOUBLE_PRECISION 0x00000004u +#define WINED3D_SHADER_CAP_OUTPUT_INTERPOLATION 0x00000008u struct shader_caps { @@ -4842,15 +4844,6 @@ static inline BOOL can_use_texture_swizzle(const struct wined3d_d3d_info *d3d_in return d3d_info->texture_swizzle && !is_complex_fixup(format->color_fixup) && !is_scaling_fixup(format->color_fixup); } -static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struct wined3d_gl_info *gl_info) -{ - /* In GLSL 4.40+ it is fine to specify interpolation qualifiers only in - * fragment shaders. In older GLSL versions interpolation qualifiers must - * match between shader stages. - */ - return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); -} - static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) { return geometry_shader

1 0

Henri Verbeet : wined3d: Get rid of the float16 fallback in context_update_stream_info().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 1c41aac4a48b4d189cc19cab72797676d27cc263 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1c41aac4a48b4d189cc19cab… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:57 2019 +0430 wined3d: Get rid of the float16 fallback in context_update_stream_info(). This is never used, since we reject creation of vertex declarations that contain any elements with unsupported formats. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 11 +---------- dlls/wined3d/vertexdeclaration.c | 5 ----- dlls/wined3d/wined3d_private.h | 1 - 3 files changed, 1 insertion(+), 16 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 9ce883d..ea7eaf9 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3601,7 +3601,6 @@ static void context_update_stream_info(struct wined3d_context *context, const st { struct wined3d_stream_info *stream_info = &context->stream_info; const struct wined3d_d3d_info *d3d_info = context->d3d_info; - const struct wined3d_gl_info *gl_info = context->gl_info; DWORD prev_all_vbo = stream_info->all_vbo; unsigned int i; WORD map; @@ -3664,15 +3663,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st if (stream_info->all_vbo) return; - if (use_vs(state)) - { - if (state->vertex_declaration->have_half_floats && !gl_info->supported[ARB_HALF_FLOAT_VERTEX]) - { - TRACE("Using immediate mode draw with vertex shaders for FLOAT16 conversion.\n"); - context->use_immediate_mode_draw = TRUE; - } - } - else + if (!use_vs(state)) { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) diff --git a/dlls/wined3d/vertexdeclaration.c b/dlls/wined3d/vertexdeclaration.c index cd8bb5e..8103274 100644 --- a/dlls/wined3d/vertexdeclaration.c +++ b/dlls/wined3d/vertexdeclaration.c @@ -251,11 +251,6 @@ static HRESULT vertexdeclaration_init(struct wined3d_vertex_declaration *declara heap_free(declaration->elements); return E_FAIL; } - - if (elements[i].format == WINED3DFMT_R16G16_FLOAT || elements[i].format == WINED3DFMT_R16G16B16A16_FLOAT) - { - declaration->have_half_floats = TRUE; - } } return WINED3D_OK; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 9f6f470..0394ba6 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -3744,7 +3744,6 @@ struct wined3d_vertex_declaration unsigned int element_count; BOOL position_transformed; - BOOL have_half_floats; }; struct wined3d_saved_states

1 0

Henri Verbeet : wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info ().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 337dc8a272af7b27cbdecd28d1e8cf5f11e92c54 URL: https://source.winehq.org/git/wine.git/?a=commit;h=337dc8a272af7b27cbdecd28… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:56 2019 +0430 wined3d: Use d3d_info to determine BGRA vertex support in context_update_stream_info(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 998aaef..9ce883d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -3675,7 +3675,7 @@ static void context_update_stream_info(struct wined3d_context *context, const st else { WORD slow_mask = -!d3d_info->ffp_generic_attributes & (1u << WINED3D_FFP_PSIZE); - slow_mask |= -(!gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && !d3d_info->ffp_generic_attributes) + slow_mask |= -(!d3d_info->vertex_bgra && !d3d_info->ffp_generic_attributes) & ((1u << WINED3D_FFP_DIFFUSE) | (1u << WINED3D_FFP_SPECULAR) | (1u << WINED3D_FFP_BLENDWEIGHT)); if ((stream_info->position_transformed && !d3d_info->xyzrhw)

1 0

Henri Verbeet : wined3d: Return a wined3d_context_gl structure from context_get_current().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 157440e3d30b536cdeb3309bd220d41d25337e93 URL: https://source.winehq.org/git/wine.git/?a=commit;h=157440e3d30b536cdeb3309b… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:55 2019 +0430 wined3d: Return a wined3d_context_gl structure from context_get_current(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/adapter_gl.c | 29 ++++++--- dlls/wined3d/arb_program_shader.c | 8 +-- dlls/wined3d/context.c | 57 +++++++++-------- dlls/wined3d/gl_compat.c | 126 +++++++++++++++++++++----------------- dlls/wined3d/wined3d_private.h | 2 +- 5 files changed, 123 insertions(+), 99 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=157440e3d30b536cdeb3…

1 0

Henri Verbeet : wined3d: Pass a wined3d_context_gl structure to context_set_current().
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 360e1a46d8d632c7779e92962929eecd4fb2747e URL: https://source.winehq.org/git/wine.git/?a=commit;h=360e1a46d8d632c7779e9296… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Mon Aug 5 17:57:54 2019 +0430 wined3d: Pass a wined3d_context_gl structure to context_set_current(). Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/context.c | 29 ++++++++++++++--------------- dlls/wined3d/wined3d_main.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 3 files changed, 16 insertions(+), 17 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index fb39339..80124c1 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -1255,13 +1255,13 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context if (context_gl->c.destroyed || !swapchain) { FIXME("Unable to get backup dc for destroyed context %p.\n", context_gl); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } if (!(context_gl->dc = swapchain_get_backup_dc(swapchain))) { - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1272,7 +1272,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Failed to set pixel format %d on device context %p.\n", context_gl->pixel_format, context_gl->dc); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1280,7 +1280,7 @@ static BOOL wined3d_context_gl_set_gl_context(struct wined3d_context_gl *context { ERR("Fallback to backup window (dc %p) failed too, last error %#x.\n", context_gl->dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); return FALSE; } @@ -1297,7 +1297,7 @@ static void context_restore_gl_context(const struct wined3d_gl_info *gl_info, HD { ERR("Failed to restore GL context %p on device context %p, last error %#x.\n", gl_ctx, dc, GetLastError()); - context_set_current(NULL); + wined3d_context_gl_set_current(NULL); } } @@ -1508,13 +1508,14 @@ struct wined3d_context *context_get_current(void) return TlsGetValue(wined3d_context_tls_idx); } -BOOL context_set_current(struct wined3d_context *ctx) +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) { + struct wined3d_context *ctx = context_gl ? &context_gl->c : NULL; struct wined3d_context *old = context_get_current(); if (old == ctx) { - TRACE("Already using D3D context %p.\n", ctx); + TRACE("Already using D3D context %p.\n", context_gl); return TRUE; } @@ -1532,20 +1533,18 @@ BOOL context_set_current(struct wined3d_context *ctx) if (wglGetCurrentContext()) { const struct wined3d_gl_info *gl_info = old->gl_info; - TRACE("Flushing context %p before switching to %p.\n", old, ctx); + TRACE("Flushing context %p before switching to %p.\n", old, context_gl); gl_info->gl_ops.gl.p_glFlush(); } old->current = 0; } } - if (ctx) + if (context_gl) { - struct wined3d_context_gl *context_gl = wined3d_context_gl(ctx); - if (!context_gl->valid) { - ERR("Trying to make invalid context %p current\n", ctx); + ERR("Trying to make invalid context %p current.\n", context_gl); return FALSE; } @@ -1553,7 +1552,7 @@ BOOL context_set_current(struct wined3d_context *ctx) context_gl, context_gl->gl_ctx, context_gl->dc); if (!wined3d_context_gl_set_gl_context(context_gl)) return FALSE; - ctx->current = 1; + context_gl->c.current = 1; } else if (wglGetCurrentContext()) { @@ -2146,7 +2145,7 @@ HRESULT wined3d_context_gl_init(struct wined3d_context_gl *context_gl, struct wi context_gl->needs_set = 1; /* Set up the context defaults */ - if (!context_set_current(context)) + if (!wined3d_context_gl_set_current(context_gl)) { ERR("Cannot activate context to set up defaults.\n"); context_release(context); @@ -4201,7 +4200,7 @@ static void wined3d_context_gl_activate(struct wined3d_context_gl *context_gl, if (&context_gl->c != context_get_current()) { - if (!context_set_current(&context_gl->c)) + if (!wined3d_context_gl_set_current(context_gl)) ERR("Failed to activate the new context.\n"); } else if (context_gl->needs_set) diff --git a/dlls/wined3d/wined3d_main.c b/dlls/wined3d/wined3d_main.c index 132c978..5d60a44 100644 --- a/dlls/wined3d/wined3d_main.c +++ b/dlls/wined3d/wined3d_main.c @@ -820,7 +820,7 @@ BOOL WINAPI DllMain(HINSTANCE inst, DWORD reason, void *reserved) break; case DLL_THREAD_DETACH: - if (!context_set_current(NULL)) + if (!wined3d_context_gl_set_current(NULL)) { ERR("Failed to clear current context.\n"); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 38a607f..8a920b4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2116,6 +2116,7 @@ void *wined3d_context_gl_map_bo_address(struct wined3d_context_gl *context_gl, const struct wined3d_bo_address *data, size_t size, GLenum binding, DWORD flags) DECLSPEC_HIDDEN; struct wined3d_context_gl *wined3d_context_gl_reacquire(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_release(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; +BOOL wined3d_context_gl_set_current(struct wined3d_context_gl *context_gl) DECLSPEC_HIDDEN; void wined3d_context_gl_set_draw_buffer(struct wined3d_context_gl *context_gl, GLenum buffer) DECLSPEC_HIDDEN; void wined3d_context_gl_texture_update(struct wined3d_context_gl *context_gl, const struct wined3d_texture_gl *texture_gl) DECLSPEC_HIDDEN; @@ -2271,7 +2272,6 @@ void context_invalidate_state(struct wined3d_context *context, DWORD state_id) D void context_resource_released(const struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void context_restore(struct wined3d_context *context, struct wined3d_texture *texture, unsigned int sub_resource_idx) DECLSPEC_HIDDEN; -BOOL context_set_current(struct wined3d_context *ctx) DECLSPEC_HIDDEN; void context_set_tls_idx(DWORD idx) DECLSPEC_HIDDEN; void context_state_drawbuf(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) DECLSPEC_HIDDEN;

1 0

Kristján Gerhardsson : wined3d: Add GPU information for a few more Intel KBL GPUs.
by Alexandre Julliard 05 Aug '19

05 Aug '19

Module: wine Branch: master Commit: 8003f1fd64aa22bec5cd29aaac6a26c30c27b1a2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8003f1fd64aa22bec5cd29aa… Author: Kristján Gerhardsson <kristjang(a)ccpgames.com> Date: Mon Aug 5 18:43:37 2019 +0430 wined3d: Add GPU information for a few more Intel KBL GPUs. Signed-off-by: Kristján Gerhardsson <kristjang(a)ccpgames.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/directx.c | 4 +++- dlls/wined3d/wined3d_private.h | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 7b4d8c5..15063e7 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -478,8 +478,10 @@ static const struct wined3d_gpu_description gpu_description_table[] = {HW_VENDOR_INTEL, CARD_INTEL_IP580_2, "Intel(R) Iris(TM) Pro Graphics 580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_1, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_IPP580_2, "Intel(R) Iris(TM) Pro Graphics P580", DRIVER_INTEL_HD4000, 2048}, + {HW_VENDOR_INTEL, CARD_INTEL_UHD617, "Intel(R) UHD Graphics 617", DRIVER_INTEL_HD4000, 2048}, {HW_VENDOR_INTEL, CARD_INTEL_HD620, "Intel(R) HD Graphics 620", DRIVER_INTEL_HD4000, 3072}, - {HW_VENDOR_INTEL, CARD_INTEL_HD630, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_1, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, + {HW_VENDOR_INTEL, CARD_INTEL_HD630_2, "Intel(R) HD Graphics 630", DRIVER_INTEL_HD4000, 3072}, }; static const struct driver_version_information *get_driver_version_info(enum wined3d_display_driver driver, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index e5c972c..38a607f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2594,8 +2594,10 @@ enum wined3d_pci_device CARD_INTEL_IP580_2 = 0x193b, CARD_INTEL_IPP580_1 = 0x193a, CARD_INTEL_IPP580_2 = 0x193d, + CARD_INTEL_UHD617 = 0x87c0, CARD_INTEL_HD620 = 0x5916, - CARD_INTEL_HD630 = 0x5912, + CARD_INTEL_HD630_1 = 0x5912, + CARD_INTEL_HD630_2 = 0x591b, }; struct wined3d_fbo_ops

1 0

← Newer
1
...
59
60
61
62
63
64
65
...
71
Older →

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