Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

[Impeller] write vertices geometry data to host buffer. #49741

Merged
merged 7 commits into from
Jan 25, 2024
Merged

[Impeller] write vertices geometry data to host buffer. #49741

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b46aaca
[Impeller] write vertices to host buffer.
Jan 12, 2024
8af5953
++
Jan 12, 2024
f6d9a91
no temp buffers for vertex contents.
Jan 12, 2024
cf2da5b
Merge branch 'main' of github.com:flutter/engine into remove_vertices…
Jan 23, 2024
6118426
++
Jan 23, 2024
f296bf2
fix for real
Jan 25, 2024
b82ade4
++
Jan 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 59 additions & 96 deletions impeller/entity/geometry/vertices_geometry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@

#include "impeller/entity/geometry/vertices_geometry.h"

#include <cstdint>
#include <utility>

#include <utility>
#include "impeller/core/formats.h"
#include "impeller/core/buffer_view.h"

namespace impeller {

Expand Down Expand Up @@ -118,34 +118,22 @@ GeometryResult VerticesGeometry::GetPositionBuffer(
size_t total_vtx_bytes = vertex_count * sizeof(float) * 2;
size_t total_idx_bytes = index_count * sizeof(uint16_t);

DeviceBufferDescriptor buffer_desc;
buffer_desc.size = total_vtx_bytes + total_idx_bytes;
buffer_desc.storage_mode = StorageMode::kHostVisible;

auto buffer =
renderer.GetContext()->GetResourceAllocator()->CreateBuffer(buffer_desc);
auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
reinterpret_cast<const uint8_t*>(vertices_.data()), total_vtx_bytes,
alignof(float));

if (!buffer->CopyHostBuffer(
reinterpret_cast<const uint8_t*>(vertices_.data()),
Range{0, total_vtx_bytes}, 0)) {
return {};
}
if (index_count > 0 &&
!buffer->CopyHostBuffer(
reinterpret_cast<uint8_t*>(const_cast<uint16_t*>(indices_.data())),
Range{0, total_idx_bytes}, total_vtx_bytes)) {
return {};
BufferView index_buffer = {};
if (index_count) {
index_buffer = renderer.GetTransientsBuffer().Emplace(
indices_.data(), total_idx_bytes, alignof(uint16_t));
}

return GeometryResult{
.type = GetPrimitiveType(),
.vertex_buffer =
{
.vertex_buffer = {.buffer = buffer,
.range = Range{0, total_vtx_bytes}},
.index_buffer = {.buffer = buffer,
.range =
Range{total_vtx_bytes, total_idx_bytes}},
.vertex_buffer = vertex_buffer,
.index_buffer = index_buffer,
.vertex_count = index_count > 0 ? index_count : vertex_count,
.index_type =
index_count > 0 ? IndexType::k16bit : IndexType::kNone,
Expand All @@ -163,47 +151,34 @@ GeometryResult VerticesGeometry::GetPositionColorBuffer(

auto index_count = indices_.size();
auto vertex_count = vertices_.size();

std::vector<VS::PerVertexData> vertex_data(vertex_count);
{
for (auto i = 0u; i < vertex_count; i++) {
vertex_data[i] = {
.position = vertices_[i],
.color = colors_[i],
};
}
}

size_t total_vtx_bytes = vertex_data.size() * sizeof(VS::PerVertexData);
size_t total_vtx_bytes = vertex_count * sizeof(VS::PerVertexData);
size_t total_idx_bytes = index_count * sizeof(uint16_t);

DeviceBufferDescriptor buffer_desc;
buffer_desc.size = total_vtx_bytes + total_idx_bytes;
buffer_desc.storage_mode = StorageMode::kHostVisible;

auto buffer =
renderer.GetContext()->GetResourceAllocator()->CreateBuffer(buffer_desc);

if (!buffer->CopyHostBuffer(reinterpret_cast<uint8_t*>(vertex_data.data()),
Range{0, total_vtx_bytes}, 0)) {
return {};
}
if (index_count > 0 &&
!buffer->CopyHostBuffer(
reinterpret_cast<uint8_t*>(const_cast<uint16_t*>(indices_.data())),
Range{0, total_idx_bytes}, total_vtx_bytes)) {
return {};
auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
total_vtx_bytes, alignof(VS::PerVertexData), [&](uint8_t* data) {
VS::PerVertexData* vtx_contents =
reinterpret_cast<VS::PerVertexData*>(data);
for (auto i = 0u; i < vertices_.size(); i++) {
VS::PerVertexData vertex_data = {
.position = vertices_[i],
.color = colors_[i],
};
std::memcpy(vtx_contents++, &vertex_data, sizeof(VS::PerVertexData));
}
});

BufferView index_buffer = {};
if (index_count > 0) {
index_buffer = renderer.GetTransientsBuffer().Emplace(
indices_.data(), total_idx_bytes, alignof(uint16_t));
}

return GeometryResult{
.type = GetPrimitiveType(),
.vertex_buffer =
{
.vertex_buffer = {.buffer = buffer,
.range = Range{0, total_vtx_bytes}},
.index_buffer = {.buffer = buffer,
.range =
Range{total_vtx_bytes, total_idx_bytes}},
.vertex_buffer = vertex_buffer,
.index_buffer = index_buffer,
.vertex_count = index_count > 0 ? index_count : vertex_count,
.index_type =
index_count > 0 ? IndexType::k16bit : IndexType::kNone,
Expand All @@ -226,54 +201,42 @@ GeometryResult VerticesGeometry::GetPositionUVBuffer(
auto uv_transform =
texture_coverage.GetNormalizingTransform() * effect_transform;
auto has_texture_coordinates = HasTextureCoordinates();
std::vector<VS::PerVertexData> vertex_data(vertex_count);
{
for (auto i = 0u; i < vertex_count; i++) {
auto vertex = vertices_[i];
auto texture_coord =
has_texture_coordinates ? texture_coordinates_[i] : vertices_[i];
auto uv = uv_transform * texture_coord;
// From experimentation we need to clamp these values to < 1.0 or else
// there can be flickering.
vertex_data[i] = {
.position = vertex,
.texture_coords =
Point(std::clamp(uv.x, 0.0f, 1.0f - kEhCloseEnough),
std::clamp(uv.y, 0.0f, 1.0f - kEhCloseEnough)),
};
}
}

size_t total_vtx_bytes = vertex_data.size() * sizeof(VS::PerVertexData);
size_t total_vtx_bytes = vertices_.size() * sizeof(VS::PerVertexData);
size_t total_idx_bytes = index_count * sizeof(uint16_t);

DeviceBufferDescriptor buffer_desc;
buffer_desc.size = total_vtx_bytes + total_idx_bytes;
buffer_desc.storage_mode = StorageMode::kHostVisible;

auto buffer =
renderer.GetContext()->GetResourceAllocator()->CreateBuffer(buffer_desc);

if (!buffer->CopyHostBuffer(reinterpret_cast<uint8_t*>(vertex_data.data()),
Range{0, total_vtx_bytes}, 0)) {
return {};
}
if (index_count > 0u &&
!buffer->CopyHostBuffer(
reinterpret_cast<uint8_t*>(const_cast<uint16_t*>(indices_.data())),
Range{0, total_idx_bytes}, total_vtx_bytes)) {
return {};
auto vertex_buffer = renderer.GetTransientsBuffer().Emplace(
total_vtx_bytes, alignof(VS::PerVertexData), [&](uint8_t* data) {
VS::PerVertexData* vtx_contents =
reinterpret_cast<VS::PerVertexData*>(data);
for (auto i = 0u; i < vertices_.size(); i++) {
auto vertex = vertices_[i];
auto texture_coord =
has_texture_coordinates ? texture_coordinates_[i] : vertices_[i];
auto uv = uv_transform * texture_coord;
// From experimentation we need to clamp these values to < 1.0 or else
// there can be flickering.
VS::PerVertexData vertex_data = {
.position = vertex,
.texture_coords =
Point(std::clamp(uv.x, 0.0f, 1.0f - kEhCloseEnough),
std::clamp(uv.y, 0.0f, 1.0f - kEhCloseEnough)),
};
std::memcpy(vtx_contents++, &vertex_data, sizeof(VS::PerVertexData));
}
});

BufferView index_buffer = {};
if (index_count > 0) {
index_buffer = renderer.GetTransientsBuffer().Emplace(
indices_.data(), total_idx_bytes, alignof(uint16_t));
}

return GeometryResult{
.type = GetPrimitiveType(),
.vertex_buffer =
{
.vertex_buffer = {.buffer = buffer,
.range = Range{0, total_vtx_bytes}},
.index_buffer = {.buffer = buffer,
.range =
Range{total_vtx_bytes, total_idx_bytes}},
.vertex_buffer = vertex_buffer,
.index_buffer = index_buffer,
.vertex_count = index_count > 0 ? index_count : vertex_count,
.index_type =
index_count > 0 ? IndexType::k16bit : IndexType::kNone,
Expand Down