kidrigger
/
project-aster
1
1
Fork 0
Code Issues 4 Pull Requests Packages Projects 1 Releases Wiki Activity

Memcpy related fixes.

This commit is contained in:
Anish Bhobe 2024-07-25 22:07:43 +02:00
parent 88d74de291
commit 6f29f580bd
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
samples/00_util/gpu_resource_manager.cpp
View File

@ -36,7 +36,7 @@ TextureManager::Commit(Texture *texture)
// Ensure it is copyable. // Ensure it is copyable.
static_assert(std::is_trivially_copyable_v<Texture>); static_assert(std::is_trivially_copyable_v<Texture>);
memcpy(allocatedTexture, texture, sizeof *texture); *allocatedTexture = *texture;
// Take ownership of the buffer. // Take ownership of the buffer.
texture->m_MipLevels_ &= ~Texture::OWNED_BIT; texture->m_MipLevels_ &= ~Texture::OWNED_BIT;
@ -51,7 +51,7 @@ TextureManager::Commit(Texture *texture)
// Ensure it is copyable. // Ensure it is copyable.
static_assert(std::is_trivially_copyable_v<Texture>); static_assert(std::is_trivially_copyable_v<Texture>);
memcpy(allocatedTexture, texture, sizeof *texture); *allocatedTexture = *texture;
texture->m_MipLevels_ &= ~Texture::OWNED_BIT; texture->m_MipLevels_ &= ~Texture::OWNED_BIT;
@ -115,7 +115,7 @@ BufferManager::Commit(StorageBuffer *buffer)
// Ensure it is copyable. // Ensure it is copyable.
static_assert(std::is_trivially_copyable_v<StorageBuffer>); static_assert(std::is_trivially_copyable_v<StorageBuffer>);
memcpy(allocatedBuffer, buffer, sizeof *buffer); *allocatedBuffer = *buffer;
// Take ownership of the buffer. // Take ownership of the buffer.
buffer->m_Size_ &= ~StorageBuffer::OWNED_BIT; buffer->m_Size_ &= ~StorageBuffer::OWNED_BIT;
@ -130,7 +130,7 @@ BufferManager::Commit(StorageBuffer *buffer)
// Ensure it is copyable. // Ensure it is copyable.
static_assert(std::is_trivially_copyable_v<StorageBuffer>); static_assert(std::is_trivially_copyable_v<StorageBuffer>);
memcpy(allocatedBuffer, buffer, sizeof *buffer); *allocatedBuffer = *buffer;
buffer->m_Size_ &= ~StorageBuffer::OWNED_BIT; buffer->m_Size_ &= ~StorageBuffer::OWNED_BIT;

8
samples/03_model_render/light_manager.cpp
View File

@ -154,10 +154,14 @@ LightManager::AddDirectional(const vec3 &direction, const vec3 &color, f32 inten
if (m_MetaInfo.m_PointLightMaxCount > 0) // Edge Case: nullptr at size 0 if (m_MetaInfo.m_PointLightMaxCount > 0) // Edge Case: nullptr at size 0
{ {
Light *oldPointStart = m_Lights.data() + oldPointLightOffset; Light *oldPointStart = m_Lights.data() + oldPointLightOffset;
Light *newPointStart = oldPointStart + 2; Light *oldPointEnd = oldPointStart + pointLightMaxCount;
Light *newPointEnd = oldPointEnd + 2;
static_assert(std::is_trivially_copyable_v<Light>); static_assert(std::is_trivially_copyable_v<Light>);
memcpy(newPointStart, oldPointStart, pointLightMaxCount * sizeof *newPointStart);
// Overlaps since 0 -> 2, 1 -> 3, 2 -> 4 (old 2 is lost)
// Backward copy fixes this.
std::copy_backward(oldPointStart, oldPointEnd, newPointEnd);
} }
m_MetaInfo.m_PointLightOffset += 2; m_MetaInfo.m_PointLightOffset += 2;