February 2019 - Wine-devel - list.winehq.org

[PATCH] mshtml: Add style.borderCollapse property implementation.
by Jacek Caban 07 Feb '19

07 Feb '19

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/mshtml/htmlstyle.c | 27 +++++++++++++++++++-------- dlls/mshtml/htmlstyle.h | 1 + dlls/mshtml/tests/style.c | 16 ++++++++++++++++ 3 files changed, 36 insertions(+), 8 deletions(-)

1 0

[PATCH 1/2] comsvcs/tests: Add tests for implicit MTA creation in RegisterDispenser().
by Zebediah Figura 07 Feb '19

07 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/comsvcs/tests/dispenser.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/dlls/comsvcs/tests/dispenser.c b/dlls/comsvcs/tests/dispenser.c index 187800ec6a..c6d85ead14 100644 --- a/dlls/comsvcs/tests/dispenser.c +++ b/dlls/comsvcs/tests/dispenser.c @@ -24,6 +24,7 @@ #include "winbase.h" #include "ole2.h" #include "comsvcs.h" +#include "msxml.h" #include "wine/test.h" @@ -141,6 +142,17 @@ static const struct IDispenserDriverVtbl driver_vtbl = static IDispenserDriver DispenserDriver = { &driver_vtbl }; +static DWORD WINAPI com_thread(void *arg) +{ + IUnknown *unk; + HRESULT hr; + + hr = CoCreateInstance(&CLSID_XMLDocument, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); + if (hr == S_OK) IUnknown_Release(unk); + + return hr; +} + static void create_dispenser(void) { static const WCHAR pool0[] = {'S','C','.','P','o','o','l',' ','0',' ','0',0}; @@ -149,7 +161,9 @@ static void create_dispenser(void) HRESULT hr; IDispenserManager *dispenser = NULL; IHolder *holder1 = NULL, *holder2 = NULL, *holder3 = NULL; + HANDLE thread; RESID resid; + DWORD ret; BSTR str; hr = CoCreateInstance( &CLSID_DispenserManager, NULL, CLSCTX_ALL, &IID_IDispenserManager, (void**)&dispenser); @@ -160,9 +174,20 @@ static void create_dispenser(void) return; } + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); + ok(ret == CO_E_NOTINITIALIZED, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder1); ok(hr == S_OK, "got 0x%08x\n", hr); + thread = CreateThread(NULL, 0, com_thread, NULL, 0, NULL); + ok(!WaitForSingleObject(thread, 1000), "wait failed\n"); + GetExitCodeThread(thread, &ret); +todo_wine + ok(ret == S_OK, "got unexpected hr %#x\n", ret); + hr = IDispenserManager_RegisterDispenser(dispenser, &DispenserDriver, pool0, &holder2); ok(hr == S_OK, "got 0x%08x\n", hr); ok(holder1 != holder2, "same holder object returned\n"); -- 2.20.1

2 2

[PATCH v2 1/5] comctl32/listbox: Check for out of bounds using the index when painting the item
by Gabriel Ivăncescu 07 Feb '19

07 Feb '19

Needed for LBS_NODATA. Signed-off-by: Gabriel Ivăncescu <gabrielopcode(a)gmail.com> --- dlls/comctl32/listbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/comctl32/listbox.c b/dlls/comctl32/listbox.c index cb645b4..9e6d8ea 100644 --- a/dlls/comctl32/listbox.c +++ b/dlls/comctl32/listbox.c @@ -508,7 +508,7 @@ static void LISTBOX_PaintItem( LB_DESCR *descr, HDC hdc, const RECT *rect, RECT r; HRGN hrgn; - if (!item) + if (index >= descr->nb_items) { if (action == ODA_FOCUS) DrawFocusRect( hdc, rect ); -- 2.19.1

2 9

[PATCH 1/4] wined3d: Store the index buffer in the wined3d_stateblock_state structure.
by Zebediah Figura 07 Feb '19

07 Feb '19

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/wined3d/device.c | 32 +++++++++++++++--------- dlls/wined3d/stateblock.c | 45 ++++++++++++++++++++++------------ dlls/wined3d/wined3d_private.h | 4 +++ 3 files changed, 54 insertions(+), 27 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index bce2a3519d..e7ad5441eb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1865,24 +1865,32 @@ void CDECL wined3d_device_set_index_buffer(struct wined3d_device *device, TRACE("device %p, buffer %p, format %s, offset %u.\n", device, buffer, debug_d3dformat(format_id), offset); - prev_buffer = device->update_state->index_buffer; - prev_format = device->update_state->index_format; - prev_offset = device->update_state->index_offset; + prev_buffer = device->state.index_buffer; + prev_format = device->state.index_format; + prev_offset = device->state.index_offset; - device->update_state->index_buffer = buffer; - device->update_state->index_format = format_id; - device->update_state->index_offset = offset; + if (buffer) + wined3d_buffer_incref(buffer); + if (device->update_stateblock_state->index_buffer) + wined3d_buffer_decref(device->update_stateblock_state->index_buffer); + device->update_stateblock_state->index_buffer = buffer; + device->update_stateblock_state->index_format = format_id; if (device->recording) + { device->recording->changed.indices = TRUE; + return; + } if (prev_buffer == buffer && prev_format == format_id && prev_offset == offset) return; if (buffer) wined3d_buffer_incref(buffer); - if (!device->recording) - wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); + device->state.index_buffer = buffer; + device->state.index_format = format_id; + device->state.index_offset = offset; + wined3d_cs_emit_set_index_buffer(device->cs, buffer, format_id, offset); if (prev_buffer) wined3d_buffer_decref(prev_buffer); } @@ -1902,7 +1910,9 @@ void CDECL wined3d_device_set_base_vertex_index(struct wined3d_device *device, I { TRACE("device %p, base_index %d.\n", device, base_index); - device->update_state->base_vertex_index = base_index; + device->update_stateblock_state->base_vertex_index = base_index; + if (!device->recording) + device->state.base_vertex_index = base_index; } INT CDECL wined3d_device_get_base_vertex_index(const struct wined3d_device *device) @@ -5219,11 +5229,11 @@ void device_resource_released(struct wined3d_device *device, struct wined3d_reso device->state.index_buffer = NULL; } - if (device->recording && &device->update_state->index_buffer->resource == resource) + if (device->recording && &device->update_stateblock_state->index_buffer->resource == resource) { ERR("Buffer resource %p is still in use by stateblock %p as index buffer.\n", resource, device->recording); - device->update_state->index_buffer = NULL; + device->update_stateblock_state->index_buffer = NULL; } break; diff --git a/dlls/wined3d/stateblock.c b/dlls/wined3d/stateblock.c index 037357c975..4b76b38326 100644 --- a/dlls/wined3d/stateblock.c +++ b/dlls/wined3d/stateblock.c @@ -524,9 +524,16 @@ void state_unbind_resources(struct wined3d_state *state) void wined3d_stateblock_state_cleanup(struct wined3d_stateblock_state *state) { struct wined3d_texture *texture; + struct wined3d_buffer *buffer; struct wined3d_shader *shader; unsigned int i; + if ((buffer = state->index_buffer)) + { + state->index_buffer = NULL; + wined3d_buffer_decref(buffer); + } + if ((shader = state->vs)) { state->vs = NULL; @@ -791,22 +798,20 @@ void CDECL wined3d_stateblock_capture(struct wined3d_stateblock *stateblock) } if (stateblock->changed.indices - && ((stateblock->state.index_buffer != src_state->index_buffer) - || (stateblock->state.base_vertex_index != src_state->base_vertex_index) - || (stateblock->state.index_format != src_state->index_format) - || (stateblock->state.index_offset != src_state->index_offset))) + && ((stateblock->stateblock_state.index_buffer != state->index_buffer) + || (stateblock->stateblock_state.base_vertex_index != state->base_vertex_index) + || (stateblock->stateblock_state.index_format != state->index_format))) { TRACE("Updating index buffer to %p, base vertex index to %d.\n", - src_state->index_buffer, src_state->base_vertex_index); + state->index_buffer, state->base_vertex_index); - if (src_state->index_buffer) - wined3d_buffer_incref(src_state->index_buffer); - if (stateblock->state.index_buffer) - wined3d_buffer_decref(stateblock->state.index_buffer); - stateblock->state.index_buffer = src_state->index_buffer; - stateblock->state.base_vertex_index = src_state->base_vertex_index; - stateblock->state.index_format = src_state->index_format; - stateblock->state.index_offset = src_state->index_offset; + if (state->index_buffer) + wined3d_buffer_incref(state->index_buffer); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_decref(stateblock->stateblock_state.index_buffer); + stateblock->stateblock_state.index_buffer = state->index_buffer; + stateblock->stateblock_state.base_vertex_index = state->base_vertex_index; + stateblock->stateblock_state.index_format = state->index_format; } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration != src_state->vertex_declaration) @@ -1106,9 +1111,17 @@ void CDECL wined3d_stateblock_apply(const struct wined3d_stateblock *stateblock) if (stateblock->changed.indices) { - wined3d_device_set_index_buffer(device, stateblock->state.index_buffer, - stateblock->state.index_format, stateblock->state.index_offset); - wined3d_device_set_base_vertex_index(device, stateblock->state.base_vertex_index); + if (stateblock->stateblock_state.index_buffer) + wined3d_buffer_incref(stateblock->stateblock_state.index_buffer); + if (state->index_buffer) + wined3d_buffer_decref(state->index_buffer); + state->index_buffer = stateblock->stateblock_state.index_buffer; + state->index_format = stateblock->stateblock_state.index_format; + state->base_vertex_index = stateblock->stateblock_state.base_vertex_index; + + wined3d_device_set_index_buffer(device, stateblock->stateblock_state.index_buffer, + stateblock->stateblock_state.index_format, 0); + wined3d_device_set_base_vertex_index(device, stateblock->stateblock_state.base_vertex_index); } if (stateblock->changed.vertexDecl && stateblock->state.vertex_declaration) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index df116cef1c..87e0b23596 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2967,6 +2967,10 @@ struct wined3d_dummy_textures struct wined3d_stateblock_state { + struct wined3d_buffer *index_buffer; + enum wined3d_format_id index_format; + int base_vertex_index; + struct wined3d_shader *vs; struct wined3d_vec4 vs_consts_f[WINED3D_MAX_VS_CONSTS_F]; struct wined3d_ivec4 vs_consts_i[WINED3D_MAX_CONSTS_I]; -- 2.20.1

2 7

[PATCH 1/2] wined3d: Ignore multisample quality for MULTISAMPLE_NONE in context_find_fbo_entry().
by Paul Gofman 07 Feb '19

07 Feb '19

Fixes 1 of 2 issues discussed in https://bugs.winehq.org/show_bug.cgi?id=39080. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> --- dlls/wined3d/context.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 37203738fe..c7eb7849fc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -599,7 +599,8 @@ static struct fbo_entry *context_find_fbo_entry(struct wined3d_context *context, depth_stencil = &ds_null; } else if (ds_texture->resource.multisample_type != rt_texture->resource.multisample_type - || ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality) + || (ds_texture->resource.multisample_type + && ds_texture->resource.multisample_quality != rt_texture->resource.multisample_quality)) { WARN("Color multisample type %u and quality %u, depth stencil has %u and %u, disabling ds buffer.\n", rt_texture->resource.multisample_type, rt_texture->resource.multisample_quality, -- 2.20.1

2 3

[PATCH v3 1/5] gdi32: Add a helper function to get the transform matrices.
by Byeongsik Jeon 07 Feb '19

07 Feb '19

Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> --- v3: Huw's comments are applied. Thank you. 'Vertical' transform position issue: Vertical transform must be separated from the rotation transform and applied before the scale transform. This is an issue at lfWidth != 0. I'll post related patch later. [v2 PATCH 4/7] is included in this patch. [v2 PATCH 7/7] has been cancelled. It's not an improvement. dlls/gdi32/freetype.c | 284 +++++++++++++++++++++--------------------- 1 file changed, 144 insertions(+), 140 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de62425173..c1a3a548eb 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -241,6 +241,14 @@ MAKE_FUNCPTR(FcPatternGetString); #define WINE_FONT_DIR "fonts" #endif +/* get_glyph_outline() glyph transform matrices index */ +enum +{ + matrix_hori, + matrix_vert, + matrix_unrotated +}; + /* This is basically a copy of FT_Bitmap_Size with an extra element added */ typedef struct { FT_Short height; @@ -6588,6 +6596,111 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } +static BOOL get_transform_matrices( GdiFont *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) +{ + static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; + BOOL needs_transform = FALSE; + double width_ratio; + int i; + + matrices[matrix_unrotated] = identity_mat; + + /* Scaling factor */ + if (font->aveWidth) + { + TEXTMETRICW tm; + get_text_metrics( font, &tm ); + + width_ratio = (double)font->aveWidth; + width_ratio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + width_ratio = font->scale_y; + + /* Scaling transform */ + if (width_ratio != 1.0 || font->scale_y != 1.0) + { + FT_Matrix scale_mat; + scale_mat.xx = FT_FixedFromFloat( width_ratio ); + scale_mat.xy = 0; + scale_mat.yx = 0; + scale_mat.yy = FT_FixedFromFloat( font->scale_y ); + + pFT_Matrix_Multiply( &scale_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Slant transform */ + if (font->fake_italic) + { + FT_Matrix slant_mat; + slant_mat.xx = (1 << 16); + slant_mat.xy = (1 << 16) >> 2; + slant_mat.yx = 0; + slant_mat.yy = (1 << 16); + + pFT_Matrix_Multiply( &slant_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Rotation transform */ + matrices[matrix_hori] = matrices[matrix_unrotated]; + if (font->orientation % 3600) + { + FT_Matrix rotation_mat; + FT_Vector angle; + + pFT_Vector_Unit( &angle, MulDiv( 1 << 16, font->orientation, 10 ) ); + rotation_mat.xx = angle.x; + rotation_mat.xy = -angle.y; + rotation_mat.yx = angle.y; + rotation_mat.yy = angle.x; + pFT_Matrix_Multiply( &rotation_mat, &matrices[matrix_hori] ); + needs_transform = TRUE; + } + + /* Vertical transform */ + matrices[matrix_vert] = matrices[matrix_hori]; + if (vertical) + { + FT_Matrix vertical_mat = { 0, -(1 << 16), 1 << 16, 0 }; /* 90 degrees rotation */ + + pFT_Matrix_Multiply( &vertical_mat, &matrices[matrix_vert] ); + needs_transform = TRUE; + } + + /* World transform */ + if (!is_identity_FMAT2( &font->font_desc.matrix )) + { + FT_Matrix world_mat; + world_mat.xx = FT_FixedFromFloat( font->font_desc.matrix.eM11 ); + world_mat.xy = -FT_FixedFromFloat( font->font_desc.matrix.eM21 ); + world_mat.yx = -FT_FixedFromFloat( font->font_desc.matrix.eM12 ); + world_mat.yy = FT_FixedFromFloat( font->font_desc.matrix.eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &world_mat, &matrices[i] ); + needs_transform = TRUE; + } + + /* Extra transformation specified by caller */ + if (!is_identity_MAT2( user_transform )) + { + FT_Matrix user_mat; + user_mat.xx = FT_FixedFromFIXED( user_transform->eM11 ); + user_mat.xy = FT_FixedFromFIXED( user_transform->eM21 ); + user_mat.yx = FT_FixedFromFIXED( user_transform->eM12 ); + user_mat.yy = FT_FixedFromFIXED( user_transform->eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &user_mat, &matrices[i] ); + needs_transform = TRUE; + } + + return needs_transform; +} + static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6629,7 +6742,7 @@ static inline BYTE get_max_level( UINT format ) extern const unsigned short vertical_orientation_table[] DECLSPEC_HIDDEN; -static BOOL check_unicode_tategaki(WCHAR uchar) +static BOOL check_unicode_vertical_orientation( WCHAR uchar ) { unsigned short orientation = vertical_orientation_table[vertical_orientation_table[vertical_orientation_table[uchar >> 8]+((uchar >> 4) & 0x0f)]+ (uchar & 0xf)]; @@ -6934,7 +7047,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; @@ -6946,14 +7058,10 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0; FT_Vector adv; INT origin_x = 0, origin_y = 0; - FT_Angle angle = 0; FT_Int load_flags = get_load_flags(format); - double widthRatio = 1.0; - FT_Matrix transMat = identityMat; - FT_Matrix transMatUnrotated; - FT_Matrix transMatTategaki; - BOOL needsTransform = FALSE; - BOOL tategaki = (font->name[0] == '@'); + FT_Matrix matrices[3]; + BOOL needs_transform = FALSE; + BOOL vertical = (font->name[0] == '@'); BOOL vertical_metrics; UINT original_index; @@ -6974,7 +7082,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, glyph_index = glyph; original_index = glyph_index; format &= ~GGO_GLYPH_INDEX; - /* TODO: Window also turns off tategaki for glyphs passed in by index + /* TODO: Window also turns off vertical for glyphs passed in by index if their unicode code points fall outside of the range that is rotated. */ } else { @@ -6982,8 +7090,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, get_glyph_index_linked(incoming_font, glyph, &font, &glyph_index, &vert); ft_face = font->ft_face; original_index = glyph_index; - if (!vert && tategaki) - tategaki = check_unicode_tategaki(glyph); + if (!vert && vertical) + vertical = check_unicode_vertical_orientation( glyph ); } format &= ~GGO_UNHINTED; @@ -7008,121 +7116,15 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - /* Scaling factor */ - if (font->aveWidth) - { - TEXTMETRICW tm; - - get_text_metrics(font, &tm); - - widthRatio = (double)font->aveWidth; - widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - widthRatio = font->scale_y; - - /* Scaling transform */ - if (widthRatio != 1.0 || font->scale_y != 1.0) - { - FT_Matrix scaleMat; - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(font->scale_y); - - pFT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (font->fake_italic) { - FT_Matrix slantMat; - - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - pFT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - transMatUnrotated = transMat; - transMatTategaki = transMat; - if(font->orientation || tategaki) { - FT_Matrix rotationMat; - FT_Matrix taterotationMat; - FT_Vector vecAngle; - - double orient = font->orientation / 10.0; - double tate_orient = 0.f; - - if (tategaki) - tate_orient = ((font->orientation+900)%3600)/10.0; - else - tate_orient = font->orientation/10.0; - - if (orient) - { - angle = FT_FixedFromFloat(orient); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); - } - - if (tate_orient) - { - angle = FT_FixedFromFloat(tate_orient); - pFT_Vector_Unit(&vecAngle, angle); - taterotationMat.xx = vecAngle.x; - taterotationMat.xy = -vecAngle.y; - taterotationMat.yx = -taterotationMat.xy; - taterotationMat.yy = taterotationMat.xx; - pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); - } - - needsTransform = TRUE; - } - - /* World transform */ - if (!is_identity_FMAT2(&font->font_desc.matrix)) - { - FT_Matrix worldMat; - worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); - pFT_Matrix_Multiply(&worldMat, &transMat); - pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); - pFT_Matrix_Multiply(&worldMat, &transMatTategaki); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (!is_identity_MAT2(lpmat)) - { - FT_Matrix extraMat; - extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); - pFT_Matrix_Multiply(&extraMat, &transMat); - pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); - pFT_Matrix_Multiply(&extraMat, &transMatTategaki); - needsTransform = TRUE; - } + needs_transform = get_transform_matrices( font, vertical, lpmat, matrices ); - vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); + vertical_metrics = (vertical && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only properly scaled and correct in 2.4.0 or greater */ if ((vertical_metrics) && (FT_Version.major < 2 || (FT_Version.major == 2 && FT_Version.minor < 4))) vertical_metrics = FALSE; - if (needsTransform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; + if (needs_transform || format != GGO_BITMAP) load_flags |= FT_LOAD_NO_BITMAP; if (vertical_metrics) load_flags |= FT_LOAD_VERTICAL_LAYOUT; err = pFT_Load_Glyph(ft_face, glyph_index, load_flags); @@ -7153,7 +7155,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, /* metrics.width = min( metrics.width, ptm->tmMaxCharWidth << 6 ); */ } - if(!needsTransform) { + if (!needs_transform) { left = (INT)(metrics.horiBearingX) & -64; right = (INT)((metrics.horiBearingX + metrics.width) + 63) & -64; top = (metrics.horiBearingY + 63) & -64; @@ -7177,7 +7179,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMatTategaki); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -7194,7 +7196,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, bottom = bottom & -64; top = (top + 63) & -64; - if (tategaki && (font->potm || get_outline_text_metrics(font))) + if (vertical && (font->potm || get_outline_text_metrics(font))) { if (vertical_metrics) lsb = metrics.horiBearingY + metrics.vertBearingY; @@ -7203,7 +7205,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = lsb; vec.y = font->potm->otmDescent << 6; TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform( &vec, &matrices[matrix_hori] ); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; lsb -= metrics.horiBearingY; @@ -7216,24 +7218,26 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - adv = get_advance_metric(incoming_font, font, &metrics, &transMat, vertical_metrics); + adv = get_advance_metric( incoming_font, font, &metrics, &matrices[matrix_hori], + vertical_metrics); gm.gmCellIncX = adv.x >> 6; gm.gmCellIncY = adv.y >> 6; - adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); + adv = get_advance_metric( incoming_font, font, &metrics, &matrices[matrix_unrotated], + vertical_metrics); adv.x = pFT_Vector_Length(&adv); adv.y = 0; vec.x = lsb; vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); if(lsb > 0) abc->abcA = pFT_Vector_Length(&vec) >> 6; else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ - vec.x = lsb + (tategaki ? metrics.height : metrics.width); + vec.x = lsb + (vertical ? metrics.height : metrics.width); vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; } @@ -7312,8 +7316,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.pixel_mode = ft_pixel_mode_mono; ft_bitmap.buffer = buf; - if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7373,8 +7377,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.pixel_mode = ft_pixel_mode_grays; ft_bitmap.buffer = buf; - if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7488,8 +7492,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, memset(buf, 0, buflen); dst = buf; - if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); + if (needs_transform) + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); #ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) @@ -7574,8 +7578,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; - if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + if (needs_transform && buf) + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -7592,8 +7596,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, FT_Outline *outline = &ft_face->glyph->outline; if(buflen == 0) buf = NULL; - if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMat); + if (needs_transform && buf) + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.20.1

2 6

[PATCH 2/2] gdi32: Add a helper function to get the transform matrices.
by Huw Davies 07 Feb '19

07 Feb '19

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 250 +++++++++++++++++++++--------------------- 1 file changed, 126 insertions(+), 124 deletions(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index 22dfe87501..b21365d61e 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -6588,6 +6588,119 @@ static inline FT_Vector normalize_vector(FT_Vector *vec) return out; } +/* get_glyph_outline() glyph transform matrices index */ +enum matrices_index +{ + matrix_hori, + matrix_vert, + matrix_unrotated +}; + +static BOOL get_transform_matrices( GdiFont *font, BOOL vertical, const MAT2 *user_transform, + FT_Matrix matrices[3] ) +{ + static const FT_Matrix identity_mat = { (1 << 16), 0, 0, (1 << 16) }; + BOOL needs_transform = FALSE; + double width_ratio; + int i; + + matrices[matrix_unrotated] = identity_mat; + + /* Scaling factor */ + if (font->aveWidth) + { + TEXTMETRICW tm; + get_text_metrics( font, &tm ); + + width_ratio = (double)font->aveWidth; + width_ratio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; + } + else + width_ratio = font->scale_y; + + /* Scaling transform */ + if (width_ratio != 1.0 || font->scale_y != 1.0) + { + FT_Matrix scale_mat; + scale_mat.xx = FT_FixedFromFloat( width_ratio ); + scale_mat.xy = 0; + scale_mat.yx = 0; + scale_mat.yy = FT_FixedFromFloat( font->scale_y ); + + pFT_Matrix_Multiply( &scale_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Slant transform */ + if (font->fake_italic) + { + FT_Matrix slant_mat; + slant_mat.xx = (1 << 16); + slant_mat.xy = (1 << 16) >> 2; + slant_mat.yx = 0; + slant_mat.yy = (1 << 16); + + pFT_Matrix_Multiply( &slant_mat, &matrices[matrix_unrotated] ); + needs_transform = TRUE; + } + + /* Rotation transform */ + matrices[matrix_hori] = matrices[matrix_unrotated]; + if (font->orientation % 3600) + { + FT_Matrix rotation_mat; + FT_Vector angle; + + pFT_Vector_Unit( &angle, MulDiv( 1 << 16, font->orientation, 10 ) ); + rotation_mat.xx = angle.x; + rotation_mat.xy = -angle.y; + rotation_mat.yx = angle.y; + rotation_mat.yy = angle.x; + pFT_Matrix_Multiply( &rotation_mat, &matrices[matrix_hori] ); + needs_transform = TRUE; + } + + /* Vertical transform */ + matrices[matrix_vert] = matrices[matrix_hori]; + if (vertical) + { + FT_Matrix vertical_mat = { 0, -(1 << 16), 1 << 16, 0 }; /* 90 degrees rotation */ + + pFT_Matrix_Multiply( &vertical_mat, &matrices[matrix_vert] ); + needs_transform = TRUE; + } + + /* World transform */ + if (!is_identity_FMAT2( &font->font_desc.matrix )) + { + FT_Matrix world_mat; + world_mat.xx = FT_FixedFromFloat( font->font_desc.matrix.eM11 ); + world_mat.xy = -FT_FixedFromFloat( font->font_desc.matrix.eM21 ); + world_mat.yx = -FT_FixedFromFloat( font->font_desc.matrix.eM12 ); + world_mat.yy = FT_FixedFromFloat( font->font_desc.matrix.eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &world_mat, &matrices[i] ); + needs_transform = TRUE; + } + + /* Extra transformation specified by caller */ + if (!is_identity_MAT2( user_transform )) + { + FT_Matrix user_mat; + user_mat.xx = FT_FixedFromFIXED( user_transform->eM11 ); + user_mat.xy = FT_FixedFromFIXED( user_transform->eM21 ); + user_mat.yx = FT_FixedFromFIXED( user_transform->eM12 ); + user_mat.yy = FT_FixedFromFIXED( user_transform->eM22 ); + + for (i = 0; i < 3; i++) + pFT_Matrix_Multiply( &user_mat, &matrices[i] ); + needs_transform = TRUE; + } + + return needs_transform; +} + static BOOL get_bold_glyph_outline(FT_GlyphSlot glyph, LONG ppem, FT_Glyph_Metrics *metrics) { FT_Error err; @@ -6934,7 +7047,6 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, LPGLYPHMETRICS lpgm, ABC *abc, DWORD buflen, LPVOID buf, const MAT2* lpmat) { - static const FT_Matrix identityMat = {(1 << 16), 0, 0, (1 << 16)}; GLYPHMETRICS gm; FT_Face ft_face = incoming_font->ft_face; GdiFont *font = incoming_font; @@ -6946,12 +7058,8 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, INT left, right, top = 0, bottom = 0; FT_Vector adv; INT origin_x = 0, origin_y = 0; - FT_Angle angle = 0; FT_Int load_flags = get_load_flags(format); - double widthRatio = 1.0; - FT_Matrix transMat = identityMat; - FT_Matrix transMatUnrotated; - FT_Matrix transMatTategaki; + FT_Matrix matrices[3]; BOOL needsTransform = FALSE; BOOL tategaki = (font->name[0] == '@'); BOOL vertical_metrics; @@ -7008,113 +7116,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if (!font->gm[original_index / GM_BLOCK_SIZE]) font->gm[original_index / GM_BLOCK_SIZE] = HeapAlloc(GetProcessHeap(),HEAP_ZERO_MEMORY, sizeof(GM) * GM_BLOCK_SIZE); - /* Scaling factor */ - if (font->aveWidth) - { - TEXTMETRICW tm; - - get_text_metrics(font, &tm); - - widthRatio = (double)font->aveWidth; - widthRatio /= (double)font->potm->otmTextMetrics.tmAveCharWidth; - } - else - widthRatio = font->scale_y; - - /* Scaling transform */ - if (widthRatio != 1.0 || font->scale_y != 1.0) - { - FT_Matrix scaleMat; - scaleMat.xx = FT_FixedFromFloat(widthRatio); - scaleMat.xy = 0; - scaleMat.yx = 0; - scaleMat.yy = FT_FixedFromFloat(font->scale_y); - - pFT_Matrix_Multiply(&scaleMat, &transMat); - needsTransform = TRUE; - } - - /* Slant transform */ - if (font->fake_italic) { - FT_Matrix slantMat; - - slantMat.xx = (1 << 16); - slantMat.xy = ((1 << 16) >> 2); - slantMat.yx = 0; - slantMat.yy = (1 << 16); - pFT_Matrix_Multiply(&slantMat, &transMat); - needsTransform = TRUE; - } - - /* Rotation transform */ - transMatUnrotated = transMat; - transMatTategaki = transMat; - if(font->orientation || tategaki) { - FT_Matrix rotationMat; - FT_Matrix taterotationMat; - FT_Vector vecAngle; - - double orient = font->orientation / 10.0; - double tate_orient = 0.f; - - if (tategaki) - tate_orient = ((font->orientation+900)%3600)/10.0; - else - tate_orient = font->orientation/10.0; - - if (orient) - { - angle = FT_FixedFromFloat(orient); - pFT_Vector_Unit(&vecAngle, angle); - rotationMat.xx = vecAngle.x; - rotationMat.xy = -vecAngle.y; - rotationMat.yx = -rotationMat.xy; - rotationMat.yy = rotationMat.xx; - - pFT_Matrix_Multiply(&rotationMat, &transMat); - } - - if (tate_orient) - { - angle = FT_FixedFromFloat(tate_orient); - pFT_Vector_Unit(&vecAngle, angle); - taterotationMat.xx = vecAngle.x; - taterotationMat.xy = -vecAngle.y; - taterotationMat.yx = -taterotationMat.xy; - taterotationMat.yy = taterotationMat.xx; - pFT_Matrix_Multiply(&taterotationMat, &transMatTategaki); - } - - needsTransform = TRUE; - } - - /* World transform */ - if (!is_identity_FMAT2(&font->font_desc.matrix)) - { - FT_Matrix worldMat; - worldMat.xx = FT_FixedFromFloat(font->font_desc.matrix.eM11); - worldMat.xy = -FT_FixedFromFloat(font->font_desc.matrix.eM21); - worldMat.yx = -FT_FixedFromFloat(font->font_desc.matrix.eM12); - worldMat.yy = FT_FixedFromFloat(font->font_desc.matrix.eM22); - pFT_Matrix_Multiply(&worldMat, &transMat); - pFT_Matrix_Multiply(&worldMat, &transMatUnrotated); - pFT_Matrix_Multiply(&worldMat, &transMatTategaki); - needsTransform = TRUE; - } - - /* Extra transformation specified by caller */ - if (!is_identity_MAT2(lpmat)) - { - FT_Matrix extraMat; - extraMat.xx = FT_FixedFromFIXED(lpmat->eM11); - extraMat.xy = FT_FixedFromFIXED(lpmat->eM21); - extraMat.yx = FT_FixedFromFIXED(lpmat->eM12); - extraMat.yy = FT_FixedFromFIXED(lpmat->eM22); - pFT_Matrix_Multiply(&extraMat, &transMat); - pFT_Matrix_Multiply(&extraMat, &transMatUnrotated); - pFT_Matrix_Multiply(&extraMat, &transMatTategaki); - needsTransform = TRUE; - } + needsTransform = get_transform_matrices( font, tategaki, lpmat, matrices ); vertical_metrics = (tategaki && FT_HAS_VERTICAL(ft_face)); /* there is a freetype bug where vertical metrics are only @@ -7177,7 +7179,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = metrics.horiBearingX + xc * metrics.width; vec.y = metrics.horiBearingY - yc * metrics.height; TRACE("Vec %ld,%ld\n", vec.x, vec.y); - pFT_Vector_Transform(&vec, &transMatTategaki); + pFT_Vector_Transform( &vec, &matrices[matrix_vert] ); if(xc == 0 && yc == 0) { left = right = vec.x; top = bottom = vec.y; @@ -7203,7 +7205,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, vec.x = lsb; vec.y = font->potm->otmDescent << 6; TRACE ("Vec %ld,%ld\n", vec.x>>6, vec.y>>6); - pFT_Vector_Transform(&vec, &transMat); + pFT_Vector_Transform( &vec, &matrices[matrix_hori] ); origin_x = (vec.x + left) & -64; origin_y = (vec.y + top + 63) & -64; lsb -= metrics.horiBearingY; @@ -7216,24 +7218,24 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, } TRACE("transformed box: (%d,%d - %d,%d)\n", left, top, right, bottom); - adv = get_advance_metric(incoming_font, font, &metrics, &transMat, vertical_metrics); + adv = get_advance_metric(incoming_font, font, &metrics, &matrices[matrix_hori], vertical_metrics); gm.gmCellIncX = adv.x >> 6; gm.gmCellIncY = adv.y >> 6; - adv = get_advance_metric(incoming_font, font, &metrics, &transMatUnrotated, vertical_metrics); + adv = get_advance_metric(incoming_font, font, &metrics, &matrices[matrix_unrotated], vertical_metrics); adv.x = pFT_Vector_Length(&adv); adv.y = 0; vec.x = lsb; vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); if(lsb > 0) abc->abcA = pFT_Vector_Length(&vec) >> 6; else abc->abcA = -((pFT_Vector_Length(&vec) + 63) >> 6); /* We use lsb again to avoid rounding errors */ vec.x = lsb + (tategaki ? metrics.height : metrics.width); vec.y = 0; - pFT_Vector_Transform(&vec, &transMatUnrotated); + pFT_Vector_Transform( &vec, &matrices[matrix_unrotated] ); abc->abcB = ((pFT_Vector_Length(&vec) + 63) >> 6) - abc->abcA; } @@ -7313,7 +7315,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7374,7 +7376,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, ft_bitmap.buffer = buf; if(needsTransform) - pFT_Outline_Transform(&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); pFT_Outline_Translate(&ft_face->glyph->outline, -left, -bottom ); @@ -7489,7 +7491,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, dst = buf; if ( needsTransform ) - pFT_Outline_Transform (&ft_face->glyph->outline, &transMatTategaki); + pFT_Outline_Transform( &ft_face->glyph->outline, &matrices[matrix_vert] ); #ifdef FT_LCD_FILTER_H if ( pFT_Library_SetLcdFilter ) @@ -7575,7 +7577,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_native_glyph_outline(outline, buflen, NULL); @@ -7593,7 +7595,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMatTategaki); + pFT_Outline_Transform( outline, &matrices[matrix_vert] ); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.18.0

1 0

[PATCH 1/2] gdi32: Fix vertical rotation.
by Huw Davies 07 Feb '19

07 Feb '19

From: Byeongsik Jeon <bsjeon(a)hanmail.net> Missed from cf891b04a087bcbc713e704c1adbf6b88243e996 Signed-off-by: Byeongsik Jeon <bsjeon(a)hanmail.net> Signed-off-by: Huw Davies <huw(a)codeweavers.com> --- dlls/gdi32/freetype.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/gdi32/freetype.c b/dlls/gdi32/freetype.c index de62425173..22dfe87501 100644 --- a/dlls/gdi32/freetype.c +++ b/dlls/gdi32/freetype.c @@ -7593,7 +7593,7 @@ static DWORD get_glyph_outline(GdiFont *incoming_font, UINT glyph, UINT format, if(buflen == 0) buf = NULL; if (needsTransform && buf) - pFT_Outline_Transform(outline, &transMat); + pFT_Outline_Transform(outline, &transMatTategaki); needed = get_bezier_glyph_outline(outline, buflen, NULL); -- 2.18.0

1 0

Sinhala NLS file
by Isira Seneviratne 07 Feb '19

07 Feb '19

Hi, Shouldn't there be a NLS file for the Sinhala language in dlls/kernel32/nls? I checked and couldn't find it. Thank you. Isira

1 0

[PATCH vkd3d 6/6] vkd3d-shader: Unset r# registers state while leaving current shader phase.
by Józef Kucia 07 Feb '19

07 Feb '19

From: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> --- libs/vkd3d-shader/spirv.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/libs/vkd3d-shader/spirv.c b/libs/vkd3d-shader/spirv.c index 3a80925a0e8b..8f9fff7f89ca 100644 --- a/libs/vkd3d-shader/spirv.c +++ b/libs/vkd3d-shader/spirv.c @@ -3980,6 +3980,7 @@ static void vkd3d_dxbc_compiler_emit_dcl_temps(struct vkd3d_dxbc_compiler *compi function_location = vkd3d_dxbc_compiler_get_current_function_location(compiler); vkd3d_spirv_begin_function_stream_insertion(builder, function_location); + assert(!compiler->temp_count); compiler->temp_count = instruction->declaration.count; for (i = 0; i < compiler->temp_count; ++i) { @@ -4810,15 +4811,24 @@ static void vkd3d_dxbc_compiler_emit_dcl_thread_group(struct vkd3d_dxbc_compiler SpvExecutionModeLocalSize, local_size, ARRAY_SIZE(local_size)); } +static void vkd3d_dxbc_compiler_leave_shader_phase(struct vkd3d_dxbc_compiler *compiler) +{ + struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; + + vkd3d_spirv_build_op_function_end(builder); + + compiler->temp_id = 0; + compiler->temp_count = 0; +} + static void vkd3d_dxbc_compiler_enter_shader_phase(struct vkd3d_dxbc_compiler *compiler, const struct vkd3d_shader_instruction *instruction) { - struct vkd3d_spirv_builder *builder = &compiler->spirv_builder; struct vkd3d_shader_phase *phase; unsigned int idx; if ((idx = compiler->shader_phase_count)) - vkd3d_spirv_build_op_function_end(builder); + vkd3d_dxbc_compiler_leave_shader_phase(compiler); if (!vkd3d_array_reserve((void **)&compiler->shader_phases, &compiler->shader_phases_size, compiler->shader_phase_count + 1, sizeof(*compiler->shader_phases))) -- 2.19.2

2 1