KJ16609/FGL-Engine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move TransferData constructors implementation into cpp

Browse Source
This commit is contained in:
kj16609
2024-07-02 16:29:49 -04:00
parent 37272722fd
commit 7611aa26d3
2 changed files with 73 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/engine/assets/TransferData.cpp
View File

@@ -7,6 +7,9 @@
#include "engine/buffers/exceptions.hpp"
#include "engine/buffers/vector/HostVector.hpp"
#include "engine/image/ImageHandle.hpp"
#include "engine/literals/size.hpp"
#include "engine/logging/logging.hpp"
#include "engine/utils.hpp"
namespace fgl::engine::memory
{
@@ -22,7 +25,7 @@ namespace fgl::engine::memory
const std::size_t hash_b { BufferHasher {}( std::get< 1 >( pair ) ) };
std::size_t seed { 0 };
fgl::engine::hashCombine( seed, hash_a, hash_b );
hashCombine( seed, hash_a, hash_b );
return seed;
}
@@ -220,4 +223,60 @@ namespace fgl::engine::memory
}
}
// Constructors
//! BUFFER_FROM_BUFFER
TransferData::TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source,
const std::shared_ptr< BufferSuballocationHandle >& target ) :
m_type( BUFFER_FROM_BUFFER ),
m_source( source ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued buffer -> buffer transfer: {}",
fgl::literals::size_literals::to_string( source->m_size ) );
markBad();
}
//! BUFFER_FROM_RAW
TransferData::
TransferData( std::vector< std::byte >&& source, const std::shared_ptr< BufferSuballocationHandle >& target ) :
m_type( BUFFER_FROM_RAW ),
m_source( std::forward< std::vector< std::byte > >( source ) ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued raw -> buffer transfer: {}",
literals::size_literals::to_string( std::get< RawData >( m_source ).size() ) );
assert( std::get< RawData >( m_source ).size() > 0 );
markBad();
}
//! IMAGE_FROM_BUFFER
TransferData::TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source, const std::shared_ptr< ImageHandle >& target ) :
m_type( IMAGE_FROM_BUFFER ),
m_source( source ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued image -> image transfer: {}",
fgl::literals::size_literals::to_string( source->m_size ) );
markBad();
}
//! IMAGE_FROM_RAW
TransferData::TransferData( std::vector< std::byte >&& source, const std::shared_ptr< ImageHandle >& target ) :
m_type( IMAGE_FROM_RAW ),
m_source( std::forward< std::vector< std::byte > >( source ) ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued raw -> image transfer: {}",
literals::size_literals::to_string( std::get< RawData >( m_source ).size() ) );
assert( std::get< RawData >( m_source ).size() > 0 );
markBad();
}
} // namespace fgl::engine::memory

71
src/engine/assets/TransferData.hpp
View File

@@ -8,11 +8,6 @@
#include <unordered_map>
#include <vector>
#include "engine/buffers/BufferSuballocationHandle.hpp"
#include "engine/literals/size.hpp"
#include "engine/logging/logging.hpp"
#include "engine/utils.hpp"
namespace vk
{
namespace raii
@@ -32,6 +27,7 @@ namespace fgl::engine
namespace fgl::engine::memory
{
struct BufferSuballocationHandle;
class Buffer;
//! <Source, Target>
@@ -108,59 +104,6 @@ namespace fgl::engine::memory
TransferData( TransferData&& other ) = default;
TransferData& operator=( TransferData&& ) = default;
//! BUFFER_FROM_BUFFER
TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source,
const std::shared_ptr< BufferSuballocationHandle >& target ) :
m_type( BUFFER_FROM_BUFFER ),
m_source( source ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued buffer -> buffer transfer: {}",
fgl::literals::size_literals::to_string( source->m_size ) );
markBad();
}
//! BUFFER_FROM_RAW
TransferData( std::vector< std::byte >&& source, const std::shared_ptr< BufferSuballocationHandle >& target ) :
m_type( BUFFER_FROM_RAW ),
m_source( std::forward< std::vector< std::byte > >( source ) ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued raw -> buffer transfer: {}",
literals::size_literals::to_string( std::get< RawData >( m_source ).size() ) );
assert( std::get< RawData >( m_source ).size() > 0 );
markBad();
}
//! IMAGE_FROM_BUFFER
TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source, const std::shared_ptr< ImageHandle >& target ) :
m_type( IMAGE_FROM_BUFFER ),
m_source( source ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued image -> image transfer: {}",
fgl::literals::size_literals::to_string( source->m_size ) );
markBad();
}
//! IMAGE_FROM_RAW
TransferData( std::vector< std::byte >&& source, const std::shared_ptr< ImageHandle >& target ) :
m_type( IMAGE_FROM_RAW ),
m_source( std::forward< std::vector< std::byte > >( source ) ),
m_target( target )
{
log::debug(
"[TransferManager]: Queued raw -> image transfer: {}",
literals::size_literals::to_string( std::get< RawData >( m_source ).size() ) );
assert( std::get< RawData >( m_source ).size() > 0 );
markBad();
}
bool stage(
vk::raii::CommandBuffer& buffer,
Buffer& staging_buffer,
@@ -173,6 +116,18 @@ namespace fgl::engine::memory
//! Marks the target as staged/ready
void markGood();
//BUFFER_FROM_X
TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source,
const std::shared_ptr< BufferSuballocationHandle >& target );
TransferData( std::vector< std::byte >&& source, const std::shared_ptr< BufferSuballocationHandle >& target );
//IMAGE_FROM_X
TransferData(
const std::shared_ptr< BufferSuballocationHandle >& source, const std::shared_ptr< ImageHandle >& target );
TransferData( std::vector< std::byte >&& source, const std::shared_ptr< ImageHandle >& target );
};
} // namespace fgl::engine::memory