LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-17 11:00:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix Mesh:setVertexMap.

Browse Source 
Fixes #1686
This commit is contained in:
Alex Szpakowski
2021-04-20 19:09:20 -03:00
parent 14cda7818f
commit 3d3c665f3c
1 changed files with 38 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/graphics/Mesh.cpp
+38 -17
View File
@@ -324,18 +324,29 @@ void Mesh::setVertexMap(const std::vector<uint32> &map)
// Calculate the size in bytes of the index buffer data. // Calculate the size in bytes of the index buffer data.
size_t size = map.size() * getIndexDataSize(datatype); size_t size = map.size() * getIndexDataSize(datatype);
if (indexBuffer.get() == nullptr || size > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) bool recreate = indexData == nullptr || indexBuffer.get() == nullptr
|| size > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat;
if (recreate)
{ {
auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS); auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
auto usage = vertexBuffer.get() ? vertexBuffer->getDataUsage() : BUFFERDATAUSAGE_DYNAMIC; auto usage = vertexBuffer.get() ? vertexBuffer->getDataUsage() : BUFFERDATAUSAGE_DYNAMIC;
Buffer::Settings settings(BUFFERUSAGEFLAG_INDEX, usage); Buffer::Settings settings(BUFFERUSAGEFLAG_INDEX, usage);
indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, size, 0), Acquire::NORETAIN); auto buffer = StrongRef(gfx->newBuffer(settings, dataformat, nullptr, size, 0), Acquire::NORETAIN);
auto data = (uint8 *) realloc(indexData, size);
if (data == nullptr)
throw love::Exception("Out of memory.");
indexData = data;
indexBuffer = buffer;
} }
useIndexBuffer = true;
indexCount = map.size(); indexCount = map.size();
useIndexBuffer = true;
indexDataType = datatype;
if (!indexBuffer || indexCount == 0) if (indexCount == 0)
return; return;
// Fill the buffer with the index values from the vector. // Fill the buffer with the index values from the vector.
@@ -350,31 +361,40 @@ void Mesh::setVertexMap(const std::vector<uint32> &map)
break; break;
} }
indexDataType = datatype; indexDataModified = true;
} }
void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasize) void Mesh::setVertexMap(IndexDataType datatype, const void *data, size_t datasize)
{ {
DataFormat dataformat = getIndexDataFormat(datatype); DataFormat dataformat = getIndexDataFormat(datatype);
if (indexBuffer.get() == nullptr || datasize > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat) bool recreate = indexData == nullptr || indexBuffer.get() == nullptr
|| datasize > indexBuffer->getSize() || indexBuffer->getDataMember(0).decl.format != dataformat;
if (recreate)
{ {
auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS); auto gfx = Module::getInstance<graphics::Graphics>(Module::M_GRAPHICS);
auto usage = vertexBuffer.get() ? vertexBuffer->getDataUsage() : BUFFERDATAUSAGE_DYNAMIC; auto usage = vertexBuffer.get() ? vertexBuffer->getDataUsage() : BUFFERDATAUSAGE_DYNAMIC;
Buffer::Settings settings(BUFFERUSAGEFLAG_INDEX, usage); Buffer::Settings settings(BUFFERUSAGEFLAG_INDEX, usage);
indexBuffer.set(gfx->newBuffer(settings, dataformat, nullptr, datasize, 0), Acquire::NORETAIN); auto buffer = StrongRef(gfx->newBuffer(settings, dataformat, nullptr, datasize, 0), Acquire::NORETAIN);
auto data = (uint8 *) realloc(indexData, datasize);
if (data == nullptr)
throw love::Exception("Out of memory.");
indexData = data;
indexBuffer = buffer;
} }
indexCount = datasize / getIndexDataSize(datatype); indexCount = datasize / getIndexDataSize(datatype);
if (!indexBuffer || indexCount == 0)
return;
Buffer::Mapper ibomap(*indexBuffer);
memcpy(ibomap.data, data, datasize);
useIndexBuffer = true; useIndexBuffer = true;
indexDataType = datatype; indexDataType = datatype;
if (indexCount == 0)
return;
memcpy(indexData, data, datasize);
indexDataModified = true;
} }
void Mesh::setVertexMap() void Mesh::setVertexMap()
@@ -386,9 +406,9 @@ void Mesh::setVertexMap()
* Copies index data from a mapped buffer to a vector. * Copies index data from a mapped buffer to a vector.
**/ **/
template <typename T> template <typename T>
static void copyFromIndexBuffer(void *buffer, size_t count, std::vector<uint32> &indices) static void copyFromIndexBuffer(const void *buffer, size_t count, std::vector<uint32> &indices)
{ {
T *elems = (T *) buffer; const T *elems = (const T *) buffer;
for (size_t i = 0; i < count; i++) for (size_t i = 0; i < count; i++)
indices.push_back((uint32) elems[i]); indices.push_back((uint32) elems[i]);
} }
@@ -399,11 +419,12 @@ bool Mesh::getVertexMap(std::vector<uint32> &map) const
return false; return false;
map.clear(); map.clear();
map.reserve(indexCount);
if (indexData == nullptr || indexCount == 0) if (indexData == nullptr || indexCount == 0)
return true; return true;
map.reserve(indexCount);
// Fill the vector from the buffer. // Fill the vector from the buffer.
switch (indexDataType) switch (indexDataType)
{ {