system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-02 09:13:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

d2d1/commandlist: Implement DrawGlyphRun() command.

Browse source 
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
This commit is contained in:
Nikolay Sivov 2022-08-01 18:35:08 +03:00 committed by Alexandre Julliard
parent c9d36114e6
commit 40e353a6a6
3 changed files with 116 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
dlls/d2d1/command_list.c
View file

@ -30,6 +30,7 @@ enum d2d_command_type
D2D_COMMAND_SET_PRIMITIVE_BLEND,
D2D_COMMAND_SET_UNIT_MODE,
D2D_COMMAND_CLEAR,
D2D_COMMAND_DRAW_GLYPH_RUN,
D2D_COMMAND_DRAW_LINE,
D2D_COMMAND_DRAW_GEOMETRY,
D2D_COMMAND_DRAW_RECTANGLE,
@ -142,6 +143,16 @@ struct d2d_command_fill_rectangle
ID2D1Brush *brush;
};
struct d2d_command_draw_glyph_run
{
struct d2d_command c;
D2D1_POINT_2F origin;
DWRITE_MEASURING_MODE measuring_mode;
ID2D1Brush *brush;
DWRITE_GLYPH_RUN run;
DWRITE_GLYPH_RUN_DESCRIPTION *run_desc;
};
static inline struct d2d_command_list *impl_from_ID2D1CommandList(ID2D1CommandList *iface)
{
return CONTAINING_RECORD(iface, struct d2d_command_list, ID2D1CommandList_iface);
@ -276,6 +287,12 @@ static HRESULT STDMETHODCALLTYPE d2d_command_list_Stream(ID2D1CommandList *iface
hr = ID2D1CommandSink_Clear(sink, &c->color);
break;
}
case D2D_COMMAND_DRAW_GLYPH_RUN:
{
const struct d2d_command_draw_glyph_run *c = data;
hr = ID2D1CommandSink_DrawGlyphRun(sink, c->origin, &c->run, c->run_desc, c->brush, c->measuring_mode);
break;
}
case D2D_COMMAND_DRAW_LINE:
{
const struct d2d_command_draw_line *c = data;
@ -714,3 +731,91 @@ void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command
command->c.op = D2D_COMMAND_SET_TEXT_RENDERING_PARAMS;
command->params = params;
}
static inline void d2d_command_list_write_field(BYTE **data, void *dst, const void *src, size_t size)
{
void **ptr = dst;
if (!src)
{
*ptr = NULL;
return;
}
*ptr = *data;
memcpy(*data, src, size);
*data = *data + size;
}
void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list,
const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run,
const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush,
DWRITE_MEASURING_MODE measuring_mode)
{
struct d2d_command_draw_glyph_run *command;
DWRITE_GLYPH_RUN_DESCRIPTION *d;
DWRITE_GLYPH_RUN *r;
UINT32 glyph_count;
ID2D1Brush *brush;
size_t size;
BYTE *data;
if (FAILED(d2d_command_list_create_brush(command_list, context, orig_brush, &brush)))
{
command_list->state = D2D_COMMAND_LIST_STATE_ERROR;
return;
}
/* Get combined size of variable data. */
glyph_count = run->glyphCount;
size = sizeof(*command);
if (run->glyphIndices) size += glyph_count * sizeof(*run->glyphIndices);
if (run->glyphAdvances) size += glyph_count * sizeof(*run->glyphAdvances);
if (run->glyphOffsets) size += glyph_count * sizeof(*run->glyphOffsets);
if (run_desc)
{
size += sizeof(*run_desc);
if (run_desc->localeName) size += (wcslen(run_desc->localeName) + 1) * sizeof(*run_desc->localeName);
if (run_desc->string) size += run_desc->stringLength * sizeof(*run_desc->string);
if (run_desc->clusterMap) size += run_desc->stringLength * sizeof(*run_desc->clusterMap);
size += sizeof(run_desc->stringLength);
size += sizeof(run_desc->textPosition);
}
d2d_command_list_reference_object(command_list, run->fontFace);
command = d2d_command_list_require_space(command_list, size);
command->c.op = D2D_COMMAND_DRAW_GLYPH_RUN;
r = &command->run;
r->fontFace = run->fontFace;
r->fontEmSize = run->fontEmSize;
r->glyphCount = run->glyphCount;
r->isSideways = run->isSideways;
r->bidiLevel = run->bidiLevel;
data = (BYTE *)(command + 1);
d2d_command_list_write_field(&data, &r->glyphIndices, run->glyphIndices, glyph_count * sizeof(*r->glyphIndices));
d2d_command_list_write_field(&data, &r->glyphAdvances, run->glyphAdvances, glyph_count * sizeof(*r->glyphAdvances));
d2d_command_list_write_field(&data, &r->glyphOffsets, run->glyphOffsets, glyph_count * sizeof(*r->glyphOffsets));
command->run_desc = NULL;
if (run_desc)
{
d = command->run_desc = (DWRITE_GLYPH_RUN_DESCRIPTION *)data;
memset(d, 0, sizeof(*d));
data += sizeof(*d);
d2d_command_list_write_field(&data, &d->localeName, run_desc->localeName, (wcslen(run_desc->localeName) + 1) * sizeof(*run_desc->localeName));
d2d_command_list_write_field(&data, &d->string, run_desc->string, run_desc->stringLength * sizeof(*run_desc->string));
d->stringLength = run_desc->stringLength;
d2d_command_list_write_field(&data, &d->clusterMap, run_desc->clusterMap, run_desc->stringLength * sizeof(*run_desc->clusterMap));
d->textPosition = run_desc->textPosition;
}
command->brush = brush;
command->origin = origin;
command->measuring_mode = measuring_mode;
}

4
dlls/d2d1/d2d1_private.h
View file

@ -761,6 +761,10 @@ void d2d_command_list_fill_rectangle(struct d2d_command_list *command_list,
const struct d2d_device_context *context, const D2D1_RECT_F *rect, ID2D1Brush *orig_brush) DECLSPEC_HIDDEN;
void d2d_command_list_set_text_rendering_params(struct d2d_command_list *command_list,
IDWriteRenderingParams *params) DECLSPEC_HIDDEN;
void d2d_command_list_draw_glyph_run(struct d2d_command_list *command_list,
const struct d2d_device_context *context, D2D1_POINT_2F origin, const DWRITE_GLYPH_RUN *run,
const DWRITE_GLYPH_RUN_DESCRIPTION *run_desc, ID2D1Brush *orig_brush,
DWRITE_MEASURING_MODE measuring_mode) DECLSPEC_HIDDEN;
static inline BOOL d2d_array_reserve(void **elements, size_t *capacity, size_t count, size_t size)
{

21
dlls/d2d1/device.c
View file

@ -1450,17 +1450,9 @@ static void STDMETHODCALLTYPE d2d_device_context_DrawGlyphRun(ID2D1DeviceContext
D2D1_POINT_2F baseline_origin, const DWRITE_GLYPH_RUN *glyph_run, ID2D1Brush *brush,
DWRITE_MEASURING_MODE measuring_mode)
{
struct d2d_device_context *context = impl_from_ID2D1DeviceContext(iface);
TRACE("iface %p, baseline_origin %s, glyph_run %p, brush %p, measuring_mode %#x.\n",
iface, debug_d2d_point_2f(&baseline_origin), glyph_run, brush, measuring_mode);
if (context->target.type == D2D_TARGET_COMMAND_LIST)
{
FIXME("Unimplemented for command list target.\n");
return;
}
ID2D1DeviceContext1_DrawGlyphRun(iface, baseline_origin, glyph_run, NULL, brush, measuring_mode);
}
@ -2373,15 +2365,16 @@ static void STDMETHODCALLTYPE d2d_device_context_ID2D1DeviceContext_DrawGlyphRun
TRACE("iface %p, baseline_origin %s, glyph_run %p, glyph_run_desc %p, brush %p, measuring_mode %#x.\n",
iface, debug_d2d_point_2f(&baseline_origin), glyph_run, glyph_run_desc, brush, measuring_mode);
if (context->target.type == D2D_TARGET_COMMAND_LIST)
{
FIXME("Unimplemented for command list target.\n");
return;
}
if (FAILED(context->error.code))
return;
if (context->target.type == D2D_TARGET_COMMAND_LIST)
{
d2d_command_list_draw_glyph_run(context->target.command_list, context, baseline_origin, glyph_run,
glyph_run_desc, brush, measuring_mode);
return;
}
rendering_params = context->text_rendering_params ? context->text_rendering_params
: context->default_text_rendering_params;