Skip to content

Commit 46e3836

Browse files
committed
rebase fixup: getFormatSize -> getFormatSizeInBytes rename
1 parent 9fbb8c1 commit 46e3836

3 files changed

Lines changed: 7 additions & 10 deletions

File tree

include/API/VertexBuffer.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct VertexBufferDesc {
3535
uint32_t getStride() const {
3636
uint32_t Stride = 0;
3737
for (const auto &S : Streams)
38-
Stride += getFormatSize(S.Fmt);
38+
Stride += getFormatSizeInBytes(S.Fmt);
3939
return Stride;
4040
}
4141

@@ -44,7 +44,7 @@ struct VertexBufferDesc {
4444
assert(Index < Streams.size() && "Stream index out of bounds");
4545
uint32_t Offset = 0;
4646
for (uint32_t I = 0; I < Index; ++I)
47-
Offset += getFormatSize(Streams[I].Fmt);
47+
Offset += getFormatSizeInBytes(Streams[I].Fmt);
4848
return Offset;
4949
}
5050
};

include/Support/Pipeline.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ struct ParsedVertexBuffer {
368368
uint32_t getStride() const {
369369
uint32_t Stride = 0;
370370
for (const auto &S : Streams)
371-
Stride += getFormatSize(S.Fmt);
371+
Stride += getFormatSizeInBytes(S.Fmt);
372372
return Stride;
373373
}
374374

lib/Support/Pipeline.cpp

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,10 @@ void MappingTraits<offloadtest::Pipeline>::mapping(IO &I,
122122
std::to_string(DescriptorTableCount));
123123

124124
if (!P.Bindings.VertexBuffer.empty()) {
125-
P.Bindings.VertexBufferPtr =
126-
P.getVertexBuffer(P.Bindings.VertexBuffer);
125+
P.Bindings.VertexBufferPtr = P.getVertexBuffer(P.Bindings.VertexBuffer);
127126
if (!P.Bindings.VertexBufferPtr)
128127
I.setError(Twine("Referenced vertex buffer ") +
129-
P.Bindings.VertexBuffer +
130-
" not found in VertexBuffers!");
128+
P.Bindings.VertexBuffer + " not found in VertexBuffers!");
131129
}
132130

133131
if (!P.Bindings.RenderTarget.empty()) {
@@ -497,14 +495,13 @@ void MappingTraits<offloadtest::ParsedVertexBuffer>::mapping(
497495
for (uint32_t V = 0; V < VertexCount; ++V) {
498496
uint32_t StreamOffset = 0;
499497
for (const auto &Stream : VB.Streams) {
500-
const uint32_t Components =
501-
offloadtest::getComponentCount(Stream.Fmt);
498+
const uint32_t Components = offloadtest::getComponentCount(Stream.Fmt);
502499
char *Dst = VB.InterleavedData.get() + V * Stride + StreamOffset;
503500
for (uint32_t C = 0; C < Components; ++C) {
504501
double Value = Stream.Values[V * Components + C];
505502
Dst += writeComponent(Dst, Value, Stream.Fmt);
506503
}
507-
StreamOffset += offloadtest::getFormatSize(Stream.Fmt);
504+
StreamOffset += offloadtest::getFormatSizeInBytes(Stream.Fmt);
508505
}
509506
}
510507
}

0 commit comments

Comments
 (0)