Skip to content

Cleanup VertexData storage. #76

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dneto0 merged 1 commit into from
Nov 20, 2018
Merged

Cleanup VertexData storage. #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 4 additions & 12 deletions src/vkscript/executor.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,18 +73,10 @@ Result Executor::Execute(Engine* engine, const amber::Script* src_script) {
continue;

const auto data = node->AsVertexData();
const auto& headers = data->GetHeaders();
const auto& rows = data->GetRows();
for (size_t i = 0; i < headers.size(); ++i) {
std::vector<Value> values;
for (const auto& row : rows) {
const auto& cell = row[i];
for (size_t z = 0; z < cell.size(); ++z)
values.push_back(cell.GetValue(z));
}

r = engine->SetBuffer(BufferType::kVertex, headers[i].location,
*(headers[i].format), values);
for (size_t i = 0; i < data->SegmentCount(); ++i) {
const auto& header = data->GetHeader(i);
r = engine->SetBuffer(BufferType::kVertex, header.location,
*(header.format), data->GetSegment(i));
if (!r.IsSuccess())
return r;
}
Expand Down
8 changes: 3 additions & 5 deletions src/vkscript/nodes.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,9 @@ VertexDataNode::VertexDataNode() : Node(NodeType::kVertexData) {}

VertexDataNode::~VertexDataNode() = default;

VertexDataNode::Cell::Cell() = default;

VertexDataNode::Cell::Cell(const VertexDataNode::Cell&) = default;

VertexDataNode::Cell::~Cell() = default;
void VertexDataNode::SetSegment(Header&& header, std::vector<Value>&& data) {
data_.push_back({std::move(header), std::move(data)});
}

} // namespace vkscript
} // namespace amber
34 changes: 11 additions & 23 deletions src/vkscript/nodes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,35 +122,23 @@ class VertexDataNode : public Node {
std::unique_ptr<Format> format;
};

class Cell {
public:
Cell();
Cell(const Cell&);
~Cell();

size_t size() const { return data_.size(); }
void AppendValue(Value&& v) { data_.emplace_back(std::move(v)); }
const Value& GetValue(size_t idx) const { return data_[idx]; }

private:
std::vector<Value> data_;
};

VertexDataNode();
~VertexDataNode() override;

const std::vector<Header>& GetHeaders() const { return headers_; }
void SetHeaders(std::vector<Header> headers) {
headers_ = std::move(headers);
}

void AddRow(std::vector<Cell> row) { rows_.push_back(std::move(row)); }
void SetSegment(Header&& header, std::vector<Value>&& data);
size_t SegmentCount() const { return data_.size(); }

const std::vector<std::vector<Cell>>& GetRows() const { return rows_; }
const Header& GetHeader(size_t idx) const { return data_[idx].header; }
const std::vector<Value>& GetSegment(size_t idx) const {
return data_[idx].buffer;
}

private:
std::vector<Header> headers_;
std::vector<std::vector<Cell>> rows_;
struct NodeData {
Header header;
std::vector<Value> buffer;
};
std::vector<NodeData> data_;
};

class TestNode : public Node {
Expand Down
20 changes: 12 additions & 8 deletions src/vkscript/parser.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,24 +331,26 @@ Result Parser::ProcessVertexDataBlock(const std::string& data) {
token = tokenizer.NextToken();
}

auto node = MakeUnique<VertexDataNode>();
// Create a number of vectors equal to the number of headers.
std::vector<std::vector<Value>> values;
values.resize(headers.size());

// Process data lines
for (; !token->IsEOS(); token = tokenizer.NextToken()) {
if (token->IsEOL())
continue;

std::vector<VertexDataNode::Cell> row;
for (const auto& header : headers) {
row.emplace_back();
for (size_t j = 0; j < headers.size(); ++j) {
const auto& header = headers[j];
auto& value_data = values[j];

if (header.format->GetPackSize() > 0) {
if (!token->IsHex())
return Result("Invalid packed value in Vertex Data");

Value v;
v.SetIntValue(token->AsHex());
row.back().AppendValue(std::move(v));
value_data.push_back(v);
} else {
auto& comps = header.format->GetComponents();
for (size_t i = 0; i < comps.size();
Expand All @@ -372,14 +374,16 @@ Result Parser::ProcessVertexDataBlock(const std::string& data) {
return Result("Invalid vertex data value");
}

row.back().AppendValue(std::move(v));
value_data.push_back(v);
}
}
}
node->AddRow(std::move(row));
}

node->SetHeaders(std::move(headers));
auto node = MakeUnique<VertexDataNode>();
for (size_t i = 0; i < headers.size(); ++i)
node->SetSegment(std::move(headers[i]), std::move(values[i]));

script_.AddVertexData(std::move(node));

return {};
Expand Down
139 changes: 45 additions & 94 deletions src/vkscript/parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,17 +312,18 @@ TEST_F(VkScriptParserTest, VertexDataHeaderFormatString) {
ASSERT_TRUE(nodes[0]->IsVertexData());

auto* data = nodes[0]->AsVertexData();
EXPECT_TRUE(data->GetRows().empty());
ASSERT_EQ(2U, data->SegmentCount());

auto& headers = data->GetHeaders();
auto& header_0 = data->GetHeader(0);
EXPECT_EQ(static_cast<size_t>(0U), header_0.location);
EXPECT_EQ(FormatType::kR32G32_SFLOAT, header_0.format->GetFormatType());
EXPECT_TRUE(data->GetSegment(0).empty());

ASSERT_EQ(2U, headers.size());
EXPECT_EQ(static_cast<size_t>(0U), headers[0].location);
EXPECT_EQ(FormatType::kR32G32_SFLOAT, headers[0].format->GetFormatType());

EXPECT_EQ(1U, headers[1].location);
auto& header_1 = data->GetHeader(1);
EXPECT_EQ(1U, header_1.location);
EXPECT_EQ(FormatType::kA8B8G8R8_UNORM_PACK32,
headers[1].format->GetFormatType());
header_1.format->GetFormatType());
EXPECT_TRUE(data->GetSegment(1).empty());
}

TEST_F(VkScriptParserTest, VertexDataHeaderGlslString) {
Expand All @@ -337,23 +338,24 @@ TEST_F(VkScriptParserTest, VertexDataHeaderGlslString) {
ASSERT_TRUE(nodes[0]->IsVertexData());

auto* data = nodes[0]->AsVertexData();
EXPECT_TRUE(data->GetRows().empty());

auto& headers = data->GetHeaders();
ASSERT_EQ(2U, data->SegmentCount());

ASSERT_EQ(2U, headers.size());
EXPECT_EQ(static_cast<size_t>(0U), headers[0].location);
EXPECT_EQ(FormatType::kR32G32_SFLOAT, headers[0].format->GetFormatType());
auto& header_0 = data->GetHeader(0);
EXPECT_EQ(static_cast<size_t>(0U), header_0.location);
EXPECT_EQ(FormatType::kR32G32_SFLOAT, header_0.format->GetFormatType());
EXPECT_TRUE(data->GetSegment(0).empty());

auto& comps1 = headers[0].format->GetComponents();
auto& comps1 = header_0.format->GetComponents();
ASSERT_EQ(2U, comps1.size());
EXPECT_EQ(FormatMode::kSFloat, comps1[0].mode);
EXPECT_EQ(FormatMode::kSFloat, comps1[1].mode);

EXPECT_EQ(1U, headers[1].location);
EXPECT_EQ(FormatType::kR32G32B32_SINT, headers[1].format->GetFormatType());
auto& header_1 = data->GetHeader(1);
EXPECT_EQ(1U, header_1.location);
EXPECT_EQ(FormatType::kR32G32B32_SINT, header_1.format->GetFormatType());
EXPECT_TRUE(data->GetSegment(1).empty());

auto& comps2 = headers[1].format->GetComponents();
auto& comps2 = header_1.format->GetComponents();
ASSERT_EQ(3U, comps2.size());
EXPECT_EQ(FormatMode::kSInt, comps2[0].mode);
EXPECT_EQ(FormatMode::kSInt, comps2[1].mode);
Expand Down Expand Up @@ -411,60 +413,23 @@ TEST_F(VkScriptParserTest, VertexDataRows) {
ASSERT_TRUE(nodes[0]->IsVertexData());

auto* data = nodes[0]->AsVertexData();
auto& headers = data->GetHeaders();
ASSERT_EQ(2U, headers.size());

// Rows is a vector of vector of cells
auto& rows = data->GetRows();
ASSERT_EQ(2U, rows.size());

// A row is a vector of Cells
const auto& row1 = rows[0];
ASSERT_EQ(2U, row1.size());

const auto& row1_cell1 = row1[0];
ASSERT_EQ(3U, row1_cell1.size());

ASSERT_TRUE(row1_cell1.GetValue(0).IsFloat());
EXPECT_FLOAT_EQ(-1, row1_cell1.GetValue(0).AsFloat());
ASSERT_TRUE(row1_cell1.GetValue(1).IsFloat());
EXPECT_FLOAT_EQ(-1, row1_cell1.GetValue(1).AsFloat());
ASSERT_TRUE(row1_cell1.GetValue(2).IsFloat());
EXPECT_FLOAT_EQ(0.25, row1_cell1.GetValue(2).AsFloat());

const auto& row1_cell2 = row1[1];
ASSERT_EQ(3U, row1_cell2.size());

ASSERT_TRUE(row1_cell2.GetValue(0).IsInteger());
EXPECT_FLOAT_EQ(255, row1_cell2.GetValue(0).AsUint8());
ASSERT_TRUE(row1_cell2.GetValue(1).IsInteger());
EXPECT_FLOAT_EQ(0, row1_cell2.GetValue(1).AsUint8());
ASSERT_TRUE(row1_cell2.GetValue(2).IsInteger());
EXPECT_FLOAT_EQ(0, row1_cell2.GetValue(2).AsUint8());

// Second row.
const auto& row2 = rows[1];
ASSERT_EQ(2U, row2.size());

const auto& row2_cell1 = row2[0];
ASSERT_EQ(3U, row2_cell1.size());

ASSERT_TRUE(row2_cell1.GetValue(0).IsFloat());
EXPECT_FLOAT_EQ(0.25, row2_cell1.GetValue(0).AsFloat());
ASSERT_TRUE(row2_cell1.GetValue(1).IsFloat());
EXPECT_FLOAT_EQ(-1, row2_cell1.GetValue(1).AsFloat());
ASSERT_TRUE(row2_cell1.GetValue(2).IsFloat());
EXPECT_FLOAT_EQ(0.25, row2_cell1.GetValue(2).AsFloat());

const auto& row2_cell2 = row2[1];
ASSERT_EQ(3U, row2_cell2.size());

ASSERT_TRUE(row2_cell2.GetValue(0).IsInteger());
EXPECT_FLOAT_EQ(255, row2_cell2.GetValue(0).AsUint8());
ASSERT_TRUE(row2_cell2.GetValue(1).IsInteger());
EXPECT_FLOAT_EQ(0, row2_cell2.GetValue(1).AsUint8());
ASSERT_TRUE(row2_cell2.GetValue(2).IsInteger());
EXPECT_FLOAT_EQ(255, row2_cell2.GetValue(2).AsUint8());
ASSERT_EQ(2U, data->SegmentCount());

std::vector<float> seg_0 = {-1.f, -1.f, 0.25f, 0.25f, -1.f, 0.25f};
const auto& values_0 = data->GetSegment(0);
ASSERT_EQ(seg_0.size(), values_0.size());
for (size_t i = 0; i < seg_0.size(); ++i) {
ASSERT_TRUE(values_0[i].IsFloat());
EXPECT_FLOAT_EQ(seg_0[i], values_0[i].AsFloat());
}

std::vector<uint8_t> seg_1 = {255, 0, 0, 255, 0, 255};
const auto& values_1 = data->GetSegment(1);
ASSERT_EQ(seg_1.size(), values_1.size());
for (size_t i = 0; i < seg_1.size(); ++i) {
ASSERT_TRUE(values_1[i].IsInteger());
EXPECT_EQ(seg_1[i], values_1[i].AsUint8());
}
}

TEST_F(VkScriptParserTest, VertexDataShortRow) {
Expand Down Expand Up @@ -509,30 +474,16 @@ TEST_F(VkScriptParserTest, VertexDataRowsWithHex) {
ASSERT_TRUE(nodes[0]->IsVertexData());

auto* data = nodes[0]->AsVertexData();
auto& headers = data->GetHeaders();
ASSERT_EQ(1U, headers.size());

auto& rows = data->GetRows();
ASSERT_EQ(2U, rows.size());
ASSERT_EQ(1U, data->SegmentCount());

// Each row has 1 cell.
auto& row1 = rows[0];
ASSERT_EQ(1U, row1.size());
std::vector<uint32_t> seg_0 = {0xff0000ff, 0xffff0000};
const auto& values_0 = data->GetSegment(0);
ASSERT_EQ(seg_0.size(), values_0.size());

auto& row1_cell1 = row1[0];
ASSERT_EQ(1U, row1_cell1.size());

ASSERT_TRUE(row1_cell1.GetValue(0).IsInteger());
EXPECT_EQ(0xff0000ff, row1_cell1.GetValue(0).AsUint32());

auto& row2 = rows[1];
ASSERT_EQ(1U, row1.size());

const auto& row2_cell1 = row2[0];
ASSERT_EQ(1U, row2_cell1.size());

ASSERT_TRUE(row2_cell1.GetValue(0).IsInteger());
EXPECT_EQ(0xffff0000, row2_cell1.GetValue(0).AsUint32());
for (size_t i = 0; i < seg_0.size(); ++i) {
ASSERT_TRUE(values_0[i].IsInteger());
EXPECT_EQ(seg_0[i], values_0[i].AsUint32());
}
}

TEST_F(VkScriptParserTest, VertexDataRowsWithHexWrongColumn) {
Expand Down