November 2017 - Wine-Commits

Józef Kucia : wined3d: Invalidate pixel shader only when rasterization is toggled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 4cfa13c5335b06d1c877994d9309da7a984498cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=4cfa13c5335b06d1c877994d9… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:17 2017 +0100 wined3d: Invalidate pixel shader only when rasterization is toggled. 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/drawprim.c | 2 +- dlls/wined3d/glsl_shader.c | 16 +++++++++++----- dlls/wined3d/wined3d_private.h | 6 ++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/drawprim.c b/dlls/wined3d/drawprim.c index 99f3ce2..95e79f7 100644 --- a/dlls/wined3d/drawprim.c +++ b/dlls/wined3d/drawprim.c @@ -648,7 +648,7 @@ void draw_primitive(struct wined3d_device *device, const struct wined3d_state *s { const struct wined3d_shader *shader = state->shader[WINED3D_SHADER_TYPE_GEOMETRY]; - if (shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(shader)) { glEnable(GL_RASTERIZER_DISCARD); checkGLcall("enable rasterizer discard"); diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 6d0e6a1..0ff9ee4 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -266,6 +266,7 @@ struct glsl_context_data { struct glsl_shader_prog_link *glsl_program; GLenum vertex_color_clamp; + BOOL rasterization_disabled; }; struct glsl_ps_compiled_shader @@ -8062,7 +8063,6 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; - const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -8089,9 +8089,9 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - if (so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(shader)) { - shader_glsl_generate_stream_output_setup(priv, shader, so_desc); + shader_glsl_generate_stream_output_setup(priv, shader, &shader->u.gs.so_desc); } else { @@ -10013,7 +10013,7 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const } /* A pixel shader is not used when rasterization is disabled. */ - if (gshader && gshader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + if (is_rasterization_disabled(gshader)) { ps_id = 0; ps_list = NULL; @@ -11366,7 +11366,13 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context, static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { - context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + struct glsl_context_data *ctx_data = context->shader_backend_data; + BOOL rasterization_disabled; + + rasterization_disabled = is_rasterization_disabled(state->shader[WINED3D_SHADER_TYPE_GEOMETRY]); + if (ctx_data->rasterization_disabled != rasterization_disabled) + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + ctx_data->rasterization_disabled = rasterization_disabled; if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 31d83c7..5368be4 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4325,6 +4325,12 @@ static inline BOOL needs_interpolation_qualifiers_for_shader_outputs(const struc return gl_info->glsl_version < MAKEDWORD_VERSION(4, 40); } +static inline BOOL is_rasterization_disabled(const struct wined3d_shader *geometry_shader) +{ + return geometry_shader + && geometry_shader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM; +} + static inline DWORD wined3d_extract_bits(const DWORD *bitstream, unsigned int offset, unsigned int count) {

1 0

Józef Kucia : d3d11/tests: Add test for stream output components.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 9b8404bfda69c5011fd173657ed18ff0f9e19349 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9b8404bfda69c5011fd173657… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:16 2017 +0100 d3d11/tests: Add test for stream output components. 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/d3d11/tests/d3d11.c | 280 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 280 insertions(+) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=9b8404bfda69c5011fd17…

1 0

Andrey Semakin : winemine: Add WM_RBUTTONUP to cases of TestMines().
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: dc3293612db9ac6ff621d68d9b134e0d8d065209 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dc3293612db9ac6ff621d68d9… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Sun Nov 5 19:24:25 2017 +0500 winemine: Add WM_RBUTTONUP to cases of TestMines(). Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index 27fc159..c7d4925 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -743,9 +743,9 @@ static void TestMines( BOARD *p_board, POINT pt, int msg ) case WM_RBUTTONDOWN: AddFlag( p_board, col, row ); break; - default: - WINE_TRACE("Unknown message type received in TestMines\n"); - break; + + case WM_RBUTTONUP: + return; } if( draw )

1 0

Piotr Caban : oleaut32: Ignore underflows in VarR8FromStr.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 409bafcc73d05adb4e67882f4ecdfc22632389dc URL: http://source.winehq.org/git/wine.git/?a=commit;h=409bafcc73d05adb4e67882f4… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 7 16:22:57 2017 +0100 oleaut32: Ignore underflows in VarR8FromStr. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/oleaut32/tests/vartest.c | 5 +++++ dlls/oleaut32/tests/vartype.c | 1 + dlls/oleaut32/variant.c | 8 ++++---- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/oleaut32/tests/vartest.c b/dlls/oleaut32/tests/vartest.c index d8a6ebf..429ffbb 100644 --- a/dlls/oleaut32/tests/vartest.c +++ b/dlls/oleaut32/tests/vartest.c @@ -1947,6 +1947,11 @@ static void test_VarNumFromParseNum(void) /* Currency is preferred over decimal */ SETRGB(0, 1); CONVERT(1,0,0,1,0,0, VTBIT_CY|VTBIT_DECIMAL); EXPECT_CY(1); + + /* Underflow test */ + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_R4); EXPECT_R4(0.0); + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_R8); EXPECT_R8(0.0); + SETRGB(0, 1); CONVERT(1,0,NUMPRS_EXPONENT,1,0,-94938484, VTBIT_CY); EXPECT_CY(0); } diff --git a/dlls/oleaut32/tests/vartype.c b/dlls/oleaut32/tests/vartype.c index be6ec91..6348fee 100644 --- a/dlls/oleaut32/tests/vartype.c +++ b/dlls/oleaut32/tests/vartype.c @@ -2729,6 +2729,7 @@ static void test_VarR8FromStr(void) CONVERT_STR(VarR8FromStr,"0.5",LOCALE_NOUSEROVERRIDE); EXPECT(0.5); CONVERT_STR(VarR8FromStr,"0.6",LOCALE_NOUSEROVERRIDE); EXPECT(0.6); CONVERT_STR(VarR8FromStr,"1.5",LOCALE_NOUSEROVERRIDE); EXPECT(1.5); + CONVERT_STR(VarR8FromStr,"1e-94938484",LOCALE_NOUSEROVERRIDE); EXPECT(0); /* We already have exhaustive tests for number parsing, so skip those tests here */ } diff --git a/dlls/oleaut32/variant.c b/dlls/oleaut32/variant.c index a760a65..a1feb27 100644 --- a/dlls/oleaut32/variant.c +++ b/dlls/oleaut32/variant.c @@ -2392,8 +2392,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; break; } whole = whole / dblMultipliers[10]; @@ -2403,8 +2403,8 @@ HRESULT WINAPI VarNumFromParseNum(NUMPARSE *pNumprs, BYTE *rgbDig, { if (whole < dblMinimums[divisor10] && whole != 0) { - dwVtBits &= ~(VTBIT_R4|VTBIT_R8|VTBIT_CY); /* Underflow */ - bOverflow = TRUE; + whole = 0; /* ignore underflow */ + divisor10 = 0; } else whole = whole / dblMultipliers[divisor10];

1 0

Józef Kucia : wined3d: Disable pixel shader when rasterization is disabled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 57433da776d31c356fbfe242e4fcbe8f59a2bb58 URL: http://source.winehq.org/git/wine.git/?a=commit;h=57433da776d31c356fbfe242e… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:14 2017 +0100 wined3d: Disable pixel shader when rasterization is disabled. Allows us to split shader output variables when rasterization is disabled. 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/glsl_shader.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 91a6c6e..11d9146 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -9926,7 +9926,13 @@ static void set_glsl_shader_program(const struct wined3d_context *context, const gs_id = find_glsl_geometry_shader(context, priv, gshader, &args); } - if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) + /* A pixel shader is not used when rasterization is disabled. */ + if (gshader && gshader->u.gs.so_desc.rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + ps_id = 0; + ps_list = NULL; + } + else if (!(context->shader_update_mask & (1u << WINED3D_SHADER_TYPE_PIXEL)) && ctx_data->glsl_program) { ps_id = ctx_data->glsl_program->ps.id; ps_list = &ctx_data->glsl_program->ps.shader_entry; @@ -11274,6 +11280,8 @@ static void glsl_vertex_pipe_hs(struct wined3d_context *context, static void glsl_vertex_pipe_geometry_shader(struct wined3d_context *context, const struct wined3d_state *state, DWORD state_id) { + context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_PIXEL; + if (state->shader[WINED3D_SHADER_TYPE_DOMAIN]) context->shader_update_mask |= 1u << WINED3D_SHADER_TYPE_DOMAIN; else if (state->shader[WINED3D_SHADER_TYPE_VERTEX]

1 0

Andrey Semakin : winemine: Save board without need to correctly finish the app.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 1392ab11122848de566424a6fee589d653237f3d URL: http://source.winehq.org/git/wine.git/?a=commit;h=1392ab11122848de566424a6f… Author: Andrey Semakin <and-semakin(a)ya.ru> Date: Mon Nov 6 14:23:19 2017 +0500 winemine: Save board without need to correctly finish the app. Thus player will never lose his best time even if app crashes. Signed-off-by: Andrey Semakin <and-semakin(a)ya.ru> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/winemine/main.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/programs/winemine/main.c b/programs/winemine/main.c index c7d4925..d8201b3 100644 --- a/programs/winemine/main.c +++ b/programs/winemine/main.c @@ -178,6 +178,8 @@ static void SaveBoard( BOARD *p_board ) RegSetValueExW( hkey, key_name, 0, REG_DWORD, (LPBYTE) &p_board->best_time[i], sizeof(p_board->best_time[i]) ); } RegCloseKey( hkey ); + + WINE_TRACE("Board has been saved.\n"); } static void DestroyBoard( BOARD *p_board ) @@ -823,6 +825,7 @@ static void TestBoard( HWND hWnd, BOARD *p_board, int x, int y, int msg ) DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_CONGRATS), hWnd, CongratsDlgProc, (LPARAM) p_board); + SaveBoard( p_board ); DialogBoxParamW( p_board->hInst, MAKEINTRESOURCEW(DLG_TIMES), hWnd, TimesDlgProc, (LPARAM) p_board); }

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeSetCompositingMode.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: baba9a8e4830bf00a68ce09cd86b39f4ec581220 URL: http://source.winehq.org/git/wine.git/?a=commit;h=baba9a8e4830bf00a68ce09cd… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 7 12:28:02 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeSetCompositingMode. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index c28ce4b..d764412 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -2857,6 +2857,10 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, { return GdipSetSmoothingMode(real_metafile->playback_graphics, (flags >> 1) & 0xff); } + case EmfPlusRecordTypeSetCompositingMode: + { + return GdipSetCompositingMode(real_metafile->playback_graphics, flags & 0xff); + } case EmfPlusRecordTypeObject: { return METAFILE_PlaybackObject(real_metafile, flags, dataSize, data);

1 0

Nikolay Sivov : gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 784fe04994f1558ea67b16990ef2690c8c83ca18 URL: http://source.winehq.org/git/wine.git/?a=commit;h=784fe04994f1558ea67b16990… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Tue Nov 7 12:28:01 2017 +0300 gdiplus/metafile: Implement playback for EmfPlusRecordTypeFillClosedCurve. Signed-off-by: Nikolay Sivov <nsivov(a)codeweavers.com> Signed-off-by: Vincent Povirk <vincent(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/gdiplus/metafile.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 94 insertions(+) diff --git a/dlls/gdiplus/metafile.c b/dlls/gdiplus/metafile.c index 989ecd0..c28ce4b 100644 --- a/dlls/gdiplus/metafile.c +++ b/dlls/gdiplus/metafile.c @@ -487,6 +487,20 @@ typedef struct EmfPlusFillPath } data; } EmfPlusFillPath; +typedef struct EmfPlusFillClosedCurve +{ + EmfPlusRecordHeader Header; + DWORD BrushId; + float Tension; + DWORD Count; + union + { + EmfPlusPointR7 pointsR[1]; + EmfPlusPoint points[1]; + EmfPlusPointF pointsF[1]; + } PointData; +} EmfPlusFillClosedCurve; + typedef struct EmfPlusFillEllipse { EmfPlusRecordHeader Header; @@ -2982,6 +2996,86 @@ GpStatus WINGDIPAPI GdipPlayMetafileRecord(GDIPCONST GpMetafile *metafile, GdipDeleteBrush((GpBrush *)solidfill); return stat; } + case EmfPlusRecordTypeFillClosedCurve: + { + static const UINT fixed_part_size = FIELD_OFFSET(EmfPlusFillClosedCurve, PointData) - + sizeof(EmfPlusRecordHeader); + EmfPlusFillClosedCurve *fill = (EmfPlusFillClosedCurve *)header; + GpSolidFill *solidfill = NULL; + GpFillMode mode; + GpBrush *brush; + UINT size, i; + + if (dataSize <= fixed_part_size) + return InvalidParameter; + + if (fill->Count == 0) + return InvalidParameter; + + if (flags & 0x800) /* P */ + size = (fixed_part_size + sizeof(EmfPlusPointR7) * fill->Count + 3) & ~3; + else if (flags & 0x4000) /* C */ + size = fixed_part_size + sizeof(EmfPlusPoint) * fill->Count; + else + size = fixed_part_size + sizeof(EmfPlusPointF) * fill->Count; + + if (dataSize != size) + return InvalidParameter; + + mode = flags & 0x200 ? FillModeWinding : FillModeAlternate; /* W */ + + if (flags & 0x8000) /* S */ + { + stat = GdipCreateSolidFill(fill->BrushId, (GpSolidFill **)&solidfill); + if (stat != Ok) + return stat; + brush = (GpBrush *)solidfill; + } + else + { + if (fill->BrushId >= EmfPlusObjectTableSize || + real_metafile->objtable[fill->BrushId].type != ObjectTypeBrush) + return InvalidParameter; + + brush = real_metafile->objtable[fill->BrushId].u.brush; + } + + if (flags & (0x800 | 0x4000)) + { + GpPointF *points = GdipAlloc(fill->Count * sizeof(*points)); + if (points) + { + if (flags & 0x800) /* P */ + { + for (i = 1; i < fill->Count; i++) + { + points[i].X = points[i - 1].X + fill->PointData.pointsR[i].X; + points[i].Y = points[i - 1].Y + fill->PointData.pointsR[i].Y; + } + } + else + { + for (i = 0; i < fill->Count; i++) + { + points[i].X = fill->PointData.points[i].X; + points[i].Y = fill->PointData.points[i].Y; + } + } + + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + points, fill->Count, fill->Tension, mode); + GdipFree(points); + } + else + stat = OutOfMemory; + } + else + stat = GdipFillClosedCurve2(real_metafile->playback_graphics, brush, + (const GpPointF *)fill->PointData.pointsF, fill->Count, fill->Tension, mode); + + GdipDeleteBrush((GpBrush *)solidfill); + return stat; + } case EmfPlusRecordTypeFillEllipse: { EmfPlusFillEllipse *fill = (EmfPlusFillEllipse *)header;

1 0

Józef Kucia : wined3d: Handle stream output components when rasterization is disabled.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: b9464cfdc250a521b4f0823e4252cec36361896c URL: http://source.winehq.org/git/wine.git/?a=commit;h=b9464cfdc250a521b4f0823e4… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Tue Nov 7 14:29:15 2017 +0100 wined3d: Handle stream output components when rasterization is disabled. Geometry shader outputs can be freely split when there is no pixel shader. 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/glsl_shader.c | 104 +++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 95 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index 11d9146..6d0e6a1 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -838,14 +838,23 @@ static void shader_glsl_generate_transform_feedback_varyings(const struct wined3 if (e->component_idx || e->component_count != 4) { - FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); - append_transform_feedback_skip_components(varyings, &count, - &strings, &length, buffer, e->component_count); - continue; - } + if (so_desc->rasterizer_stream_idx != WINED3D_NO_RASTERIZER_STREAM) + { + FIXME("Unsupported component range %u-%u.\n", e->component_idx, e->component_count); + append_transform_feedback_skip_components(varyings, &count, + &strings, &length, buffer, e->component_count); + continue; + } - string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); - append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + string_buffer_sprintf(buffer, "shader_in_out.reg%u_%u_%u", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } + else + { + string_buffer_sprintf(buffer, "shader_in_out.reg%u", e->register_idx); + append_transform_feedback_varying(varyings, &count, &strings, &length, buffer); + } } if (buffer_idx < so_desc->buffer_stride_count @@ -7119,6 +7128,75 @@ static GLuint shader_glsl_generate_vs3_rasterizer_input_setup(struct shader_glsl return ret; } +static void shader_glsl_generate_stream_output_setup(struct shader_glsl_priv *priv, + const struct wined3d_shader *shader, const struct wined3d_stream_output_desc *so_desc) +{ + struct wined3d_string_buffer *buffer = &priv->shader_buffer; + unsigned int i; + + shader_addline(buffer, "out shader_in_out\n{\n"); + for (i = 0; i < so_desc->element_count; ++i) + { + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; + + if (e->stream_idx) + { + FIXME("Unhandled stream %u.\n", e->stream_idx); + continue; + } + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + continue; + + if (e->component_idx || e->component_count != 4) + { + if (e->component_count == 1) + shader_addline(buffer, "float"); + else + shader_addline(buffer, "vec%u", e->component_count); + shader_addline(buffer, " reg%u_%u_%u;\n", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1); + } + else + { + shader_addline(buffer, "vec4 reg%u;\n", e->register_idx); + } + } + shader_addline(buffer, "} shader_out;\n"); + + shader_addline(buffer, "void setup_gs_output(in vec4 outputs[%u])\n{\n", + shader->limits->packed_output); + for (i = 0; i < so_desc->element_count; ++i) + { + const struct wined3d_stream_output_element *e = &so_desc->elements[i]; + + if (e->stream_idx) + { + FIXME("Unhandled stream %u.\n", e->stream_idx); + continue; + } + if (e->register_idx == WINED3D_STREAM_OUTPUT_GAP) + continue; + + if (e->component_idx || e->component_count != 4) + { + DWORD write_mask; + char str_mask[6]; + + write_mask = ((1u << e->component_count) - 1) << e->component_idx; + shader_glsl_write_mask_to_str(write_mask, str_mask); + shader_addline(buffer, "shader_out.reg%u_%u_%u = outputs[%u]%s;\n", + e->register_idx, e->component_idx, e->component_idx + e->component_count - 1, + e->register_idx, str_mask); + } + else + { + shader_addline(buffer, "shader_out.reg%u = outputs[%u];\n", + e->register_idx, e->register_idx); + } + } + shader_addline(buffer, "}\n"); +} + static void shader_glsl_generate_sm4_output_setup(struct shader_glsl_priv *priv, const struct wined3d_shader *shader, unsigned int input_count, const struct wined3d_gl_info *gl_info, BOOL rasterizer_setup, const DWORD *interpolation_mode) @@ -7984,6 +8062,7 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context struct shader_glsl_priv *priv, const struct wined3d_shader *shader, const struct gs_compile_args *args) { struct wined3d_string_buffer_list *string_buffers = &priv->string_buffers; + const struct wined3d_stream_output_desc *so_desc = &shader->u.gs.so_desc; const struct wined3d_shader_reg_maps *reg_maps = &shader->reg_maps; struct wined3d_string_buffer *buffer = &priv->shader_buffer; const struct wined3d_gl_info *gl_info = context->gl_info; @@ -8010,8 +8089,15 @@ static GLuint shader_glsl_generate_geometry_shader(const struct wined3d_context if (!gl_info->supported[ARB_CLIP_CONTROL]) shader_addline(buffer, "uniform vec4 pos_fixup;\n"); - shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, - gl_info, TRUE, args->interpolation_mode); + if (so_desc->rasterizer_stream_idx == WINED3D_NO_RASTERIZER_STREAM) + { + shader_glsl_generate_stream_output_setup(priv, shader, so_desc); + } + else + { + shader_glsl_generate_sm4_output_setup(priv, shader, args->output_count, + gl_info, TRUE, args->interpolation_mode); + } shader_addline(buffer, "void main()\n{\n"); if (FAILED(shader_generate_code(shader, buffer, reg_maps, &priv_ctx, NULL, NULL))) return 0;

1 0

Jacek Caban : mshtml: Merge hlink.c into persist.c.
by Alexandre Julliard Nov. 7, 2017

Nov. 7, 2017

Module: wine Branch: master Commit: 2de948e86c184ee4b9d958e7878ee31f8c15496e URL: http://source.winehq.org/git/wine.git/?a=commit;h=2de948e86c184ee4b9d958e78… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Nov 7 14:28:15 2017 +0100 mshtml: Merge hlink.c into persist.c. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/mshtml/Makefile.in | 1 - dlls/mshtml/hlink.c | 123 ------------------------------------------- dlls/mshtml/htmldoc.c | 1 - dlls/mshtml/mshtml_private.h | 1 - dlls/mshtml/persist.c | 86 ++++++++++++++++++++++++++++++ 5 files changed, 86 insertions(+), 126 deletions(-) diff --git a/dlls/mshtml/Makefile.in b/dlls/mshtml/Makefile.in index 097ba70..f281c52 100644 --- a/dlls/mshtml/Makefile.in +++ b/dlls/mshtml/Makefile.in @@ -7,7 +7,6 @@ C_SRCS = \ conpoint.c \ dispex.c \ editor.c \ - hlink.c \ htmlanchor.c \ htmlarea.c \ htmlattr.c \ diff --git a/dlls/mshtml/hlink.c b/dlls/mshtml/hlink.c deleted file mode 100644 index 7ce0423..0000000 --- a/dlls/mshtml/hlink.c +++ /dev/null @@ -1,123 +0,0 @@ -/* - * Copyright 2005-2006 Jacek Caban for CodeWeavers - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA - */ - -#include <stdarg.h> - -#define COBJMACROS - -#include "windef.h" -#include "winbase.h" -#include "winuser.h" -#include "ole2.h" - -#include "wine/debug.h" - -#include "mshtml_private.h" -#include "binding.h" - -WINE_DEFAULT_DEBUG_CHANNEL(mshtml); - -/********************************************************** - * IHlinkTarget implementation - */ - -static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) -{ - return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); -} - -static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_query_interface(This, riid, ppv); -} - -static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_addref(This); -} - -static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - return htmldoc_release(This); -} - -static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%p)\n", This, pihlbc); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%p)\n", This, ppihlbc); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - - TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); - - if(grfHLNF) - FIXME("Unsupported grfHLNF=%08x\n", grfHLNF); - if(pwzJumpLocation) - FIXME("JumpLocation not supported\n"); - - if(!This->doc_obj->client) - return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); - - return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); -} - -static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, - IMoniker **ppimkLocation) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); - return E_NOTIMPL; -} - -static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, - LPWSTR *ppwzFriendlyName) -{ - HTMLDocument *This = impl_from_IHlinkTarget(iface); - FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); - return E_NOTIMPL; -} - -static const IHlinkTargetVtbl HlinkTargetVtbl = { - HlinkTarget_QueryInterface, - HlinkTarget_AddRef, - HlinkTarget_Release, - HlinkTarget_SetBrowseContext, - HlinkTarget_GetBrowseContext, - HlinkTarget_Navigate, - HlinkTarget_GetMoniker, - HlinkTarget_GetFriendlyName -}; - -void HTMLDocument_Hlink_Init(HTMLDocument *This) -{ - This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; -} diff --git a/dlls/mshtml/htmldoc.c b/dlls/mshtml/htmldoc.c index 55d55f7..0752730 100644 --- a/dlls/mshtml/htmldoc.c +++ b/dlls/mshtml/htmldoc.c @@ -4866,7 +4866,6 @@ static void init_doc(HTMLDocument *doc, IUnknown *outer, IDispatchEx *dispex) HTMLDocument_View_Init(doc); HTMLDocument_Window_Init(doc); HTMLDocument_Service_Init(doc); - HTMLDocument_Hlink_Init(doc); ConnectionPointContainer_Init(&doc->cp_container, (IUnknown*)&doc->IHTMLDocument2_iface, HTMLDocument_cpc); } diff --git a/dlls/mshtml/mshtml_private.h b/dlls/mshtml/mshtml_private.h index 8965d46..9fff0d2 100644 --- a/dlls/mshtml/mshtml_private.h +++ b/dlls/mshtml/mshtml_private.h @@ -869,7 +869,6 @@ void HTMLDocument_OleObj_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_View_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Window_Init(HTMLDocument*) DECLSPEC_HIDDEN; void HTMLDocument_Service_Init(HTMLDocument*) DECLSPEC_HIDDEN; -void HTMLDocument_Hlink_Init(HTMLDocument*) DECLSPEC_HIDDEN; void TargetContainer_Init(HTMLDocumentObj*) DECLSPEC_HIDDEN; void init_binding_ui(HTMLDocumentObj*) DECLSPEC_HIDDEN; diff --git a/dlls/mshtml/persist.c b/dlls/mshtml/persist.c index fa1bb6e..55cb5b0 100644 --- a/dlls/mshtml/persist.c +++ b/dlls/mshtml/persist.c @@ -1137,6 +1137,91 @@ static const IPersistHistoryVtbl PersistHistoryVtbl = { PersistHistory_GetPositionCookie }; +/********************************************************** + * IHlinkTarget implementation + */ + +static inline HTMLDocument *impl_from_IHlinkTarget(IHlinkTarget *iface) +{ + return CONTAINING_RECORD(iface, HTMLDocument, IHlinkTarget_iface); +} + +static HRESULT WINAPI HlinkTarget_QueryInterface(IHlinkTarget *iface, REFIID riid, void **ppv) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_query_interface(This, riid, ppv); +} + +static ULONG WINAPI HlinkTarget_AddRef(IHlinkTarget *iface) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_addref(This); +} + +static ULONG WINAPI HlinkTarget_Release(IHlinkTarget *iface) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + return htmldoc_release(This); +} + +static HRESULT WINAPI HlinkTarget_SetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext *pihlbc) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%p)\n", This, pihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_GetBrowseContext(IHlinkTarget *iface, IHlinkBrowseContext **ppihlbc) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%p)\n", This, ppihlbc); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_Navigate(IHlinkTarget *iface, DWORD grfHLNF, LPCWSTR pwzJumpLocation) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + + TRACE("(%p)->(%08x %s)\n", This, grfHLNF, debugstr_w(pwzJumpLocation)); + + if(grfHLNF) + FIXME("Unsupported grfHLNF=%08x\n", grfHLNF); + if(pwzJumpLocation) + FIXME("JumpLocation not supported\n"); + + if(!This->doc_obj->client) + return navigate_new_window(This->window, This->window->uri, NULL, NULL, NULL); + + return IOleObject_DoVerb(&This->IOleObject_iface, OLEIVERB_SHOW, NULL, NULL, -1, NULL, NULL); +} + +static HRESULT WINAPI HlinkTarget_GetMoniker(IHlinkTarget *iface, LPCWSTR pwzLocation, DWORD dwAssign, + IMoniker **ppimkLocation) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%s %08x %p)\n", This, debugstr_w(pwzLocation), dwAssign, ppimkLocation); + return E_NOTIMPL; +} + +static HRESULT WINAPI HlinkTarget_GetFriendlyName(IHlinkTarget *iface, LPCWSTR pwzLocation, + LPWSTR *ppwzFriendlyName) +{ + HTMLDocument *This = impl_from_IHlinkTarget(iface); + FIXME("(%p)->(%s %p)\n", This, debugstr_w(pwzLocation), ppwzFriendlyName); + return E_NOTIMPL; +} + +static const IHlinkTargetVtbl HlinkTargetVtbl = { + HlinkTarget_QueryInterface, + HlinkTarget_AddRef, + HlinkTarget_Release, + HlinkTarget_SetBrowseContext, + HlinkTarget_GetBrowseContext, + HlinkTarget_Navigate, + HlinkTarget_GetMoniker, + HlinkTarget_GetFriendlyName +}; + void HTMLDocument_Persist_Init(HTMLDocument *This) { This->IPersistMoniker_iface.lpVtbl = &PersistMonikerVtbl; @@ -1144,4 +1229,5 @@ void HTMLDocument_Persist_Init(HTMLDocument *This) This->IMonikerProp_iface.lpVtbl = &MonikerPropVtbl; This->IPersistStreamInit_iface.lpVtbl = &PersistStreamInitVtbl; This->IPersistHistory_iface.lpVtbl = &PersistHistoryVtbl; + This->IHlinkTarget_iface.lpVtbl = &HlinkTargetVtbl; }

1 0