Skip to content

W
wine-winehq
Commit 4460006f authored by Henri Verbeet's avatar Henri Verbeet Committed by Alexandre Julliard
Browse files
Options

d2d1: Only draw if the geometry has any faces in d2d_d3d_render_target_FillGeometry().

parent 20ad2e39
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 21 deletions
dlls/d2d1/render_target.c
View file @ 4460006f
...@@ -713,32 +713,35 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg ...@@ -713,32 +713,35 @@ static void STDMETHODCALLTYPE d2d_d3d_render_target_FillGeometry(ID2D1RenderTarg
return; return;
} }
buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces); if (geometry_impl->face_count)
buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER;
buffer_data.pSysMem = geometry_impl->faces;
if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib)))
{ {
WARN("Failed to create index buffer, hr %#x.\n", hr); buffer_desc.ByteWidth = geometry_impl->face_count * sizeof(*geometry_impl->faces);
goto done; buffer_desc.BindFlags = D3D10_BIND_INDEX_BUFFER;
} buffer_data.pSysMem = geometry_impl->faces;
buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices); if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &ib)))
buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER; {
buffer_data.pSysMem = geometry_impl->vertices; WARN("Failed to create index buffer, hr %#x.\n", hr);
goto done;
}
if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb))) buffer_desc.ByteWidth = geometry_impl->vertex_count * sizeof(*geometry_impl->vertices);
{ buffer_desc.BindFlags = D3D10_BIND_VERTEX_BUFFER;
ERR("Failed to create vertex buffer, hr %#x.\n", hr); buffer_data.pSysMem = geometry_impl->vertices;
ID3D10Buffer_Release(ib);
goto done;
}
d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb, if (FAILED(hr = ID3D10Device_CreateBuffer(render_target->device, &buffer_desc, &buffer_data, &vb)))
sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl); {
ERR("Failed to create vertex buffer, hr %#x.\n", hr);
ID3D10Buffer_Release(ib);
goto done;
}
ID3D10Buffer_Release(vb); d2d_draw(render_target, D2D_SHAPE_TYPE_TRIANGLE, ib, 3 * geometry_impl->face_count, vb,
ID3D10Buffer_Release(ib); sizeof(*geometry_impl->vertices), vs_cb, ps_cb, brush_impl);
ID3D10Buffer_Release(vb);
ID3D10Buffer_Release(ib);
}
if (geometry_impl->bezier_count) if (geometry_impl->bezier_count)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment