mirror of
https://github.com/scp-fs2open/fs2open.github.com.git
synced 2026-11-09 13:01:29 -10:00
asarium
acc018507b
This changes the model loading code such that all index and vertex data is packed in a single GPU buffer for each data type (index and vertex data are still in separate buffers). This reduces the amount of buffer rebinding needed when rendering a scene which will reduce the CPU overhead. Furthermore, this opens up possibilities of future improvements for which it is beneficial if all data is in the same buffer (e.g. MultiDrawIndirect rendering). To manage where to put the data in the GPU buffer I implemented a custom HeapAllocator which manages where data can be put. It uses a very primitive first-fit algorithm but that is sufficient for this usage type. This does add quite a lot of overhead while allocating GPU model data (I did some tracing and some allocation calls took as long as 130ms). This fixes #1457.
75 lines
1.8 KiB
C++
75 lines
1.8 KiB
C++
#pragma once
|
|
|
|
#include "globalincs/pstypes.h"
|
|
|
|
#include <functional>
|
|
|
|
namespace util {
|
|
|
|
/**
|
|
* @brief A generic heap manager
|
|
*
|
|
* This class does not allocate memory! It only keeps track of where memory is stored and which memory ranges may be
|
|
* reused later. This needs some kind of underlying memory manager before it can do anything.
|
|
*/
|
|
class HeapAllocator {
|
|
public:
|
|
/**
|
|
* @brief A function that can resize a generic heap structure.
|
|
*
|
|
* This takes the new size of the heap as its only parameter.
|
|
*/
|
|
typedef std::function<void(size_t)> HeapResizer;
|
|
|
|
private:
|
|
struct MemoryRange {
|
|
size_t offset = 0;
|
|
size_t size = 0;
|
|
|
|
bool operator<(const MemoryRange& other) const;
|
|
bool operator==(const MemoryRange& other) const;
|
|
};
|
|
|
|
size_t _heapSize = 0;
|
|
size_t _lastSizeIncraese = 0;
|
|
|
|
HeapResizer _heapResizer;
|
|
|
|
SCP_vector<MemoryRange> _freeRanges;
|
|
SCP_vector<MemoryRange> _allocatedRanges;
|
|
|
|
void addFreeRange(const MemoryRange& range);
|
|
void addAllocatedRange(const MemoryRange& range);
|
|
|
|
/**
|
|
* @brief Checks if all free ranges are merged properly.
|
|
*/
|
|
void checkRangesMerged();
|
|
|
|
static bool check_connected_range(const MemoryRange& left, const MemoryRange& right);
|
|
public:
|
|
explicit HeapAllocator(const HeapResizer& creatorFunction);
|
|
~HeapAllocator() = default;
|
|
|
|
/**
|
|
* @brief Allocates the specified amount of memory
|
|
* @param size The size of the memory block to allocate
|
|
* @return The offset at which the specified amount of memory can be used
|
|
*/
|
|
size_t allocate(size_t size);
|
|
|
|
/**
|
|
* @brief Frees the memory starting at the specified offset.
|
|
* @param offset The offset at which to free memory. This value must have been returned by allocate previously!
|
|
*/
|
|
void free(size_t offset);
|
|
|
|
/**
|
|
* @brief Retrieves the amount of allocations currently active
|
|
* @return The active allocations in this heap.
|
|
*/
|
|
size_t numAllocations() const;
|
|
};
|
|
|
|
}
|