Skip to content

Commit 65062f8

Browse files
committed
fix template types to avoid redefn error on 32bit machines
1 parent 7df393e commit 65062f8

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/render/templated_buffers.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ std::shared_ptr<AttributeBuffer> generateAttributeBuffer<glm::vec4>(Engine* engi
5656
}
5757

5858
template <>
59-
std::shared_ptr<AttributeBuffer> generateAttributeBuffer<size_t>(Engine* engine) {
59+
std::shared_ptr<AttributeBuffer> generateAttributeBuffer<uint64_t>(Engine* engine) {
6060
return engine->generateAttributeBuffer(RenderDataType::UInt);
6161
}
6262

@@ -137,7 +137,7 @@ glm::vec4 getAttributeBufferData<glm::vec4>(AttributeBuffer& buff, size_t ind) {
137137
}
138138

139139
template <>
140-
size_t getAttributeBufferData<size_t>(AttributeBuffer& buff, size_t ind) {
140+
uint64_t getAttributeBufferData<uint64_t>(AttributeBuffer& buff, size_t ind) {
141141
return buff.getData_uint32(ind);
142142
}
143143

@@ -233,13 +233,13 @@ std::vector<glm::vec4> getAttributeBufferDataRange<glm::vec4>(AttributeBuffer& b
233233
}
234234

235235
template <>
236-
std::vector<size_t> getAttributeBufferDataRange<size_t>(AttributeBuffer& buff, size_t ind, size_t count) {
236+
std::vector<size_t> getAttributeBufferDataRange<uint64_t>(AttributeBuffer& buff, size_t ind, size_t count) {
237237
std::vector<uint32_t> uint32Vals = buff.getDataRange_uint32(ind, count);
238-
std::vector<size_t> sizetVals(count);
238+
std::vector<uint64_t> uint64Vals(count);
239239
for (size_t i = 0; i < count; i++) {
240-
sizetVals[i] = static_cast<size_t>(uint32Vals[i]);
240+
uint64Vals[i] = static_cast<uint64_t>(uint32Vals[i]);
241241
}
242-
return sizetVals;
242+
return uint64Vals;
243243
}
244244

245245
template <>

0 commit comments

Comments
 (0)