Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -16,56 +16,53 @@
namespace OGL
{
class StreamBuffer
{
public:
static std::unique_ptr<StreamBuffer> Create(u32 type, u32 size);
virtual ~StreamBuffer();
static std::unique_ptr<StreamBuffer> Create(u32 type, u32 size);
virtual ~StreamBuffer();
/* This mapping function will return a pair of:
* - the pointer to the mapped buffer
* - the offset into the real GPU buffer (always multiple of stride)
* On mapping, the maximum of size for allocation has to be set.
* The size really pushed into this fifo only has to be known on Unmapping.
* Mapping invalidates the current buffer content,
* so it isn't allowed to access the old content any more.
*/
virtual std::pair<u8*, u32> Map(u32 size) = 0;
virtual void Unmap(u32 used_size) = 0;
/* This mapping function will return a pair of:
* - the pointer to the mapped buffer
* - the offset into the real GPU buffer (always multiple of stride)
* On mapping, the maximum of size for allocation has to be set.
* The size really pushed into this fifo only has to be known on Unmapping.
* Mapping invalidates the current buffer content,
* so it isn't allowed to access the old content any more.
*/
virtual std::pair<u8*, u32> Map(u32 size) = 0;
virtual void Unmap(u32 used_size) = 0;
std::pair<u8*, u32> Map(u32 size, u32 stride)
{
u32 padding = m_iterator % stride;
if (padding)
{
m_iterator += stride - padding;
}
return Map(size);
}
std::pair<u8*, u32> Map(u32 size, u32 stride)
{
u32 padding = m_iterator % stride;
if (padding)
{
m_iterator += stride - padding;
}
return Map(size);
}
const u32 m_buffer;
const u32 m_buffer;
protected:
StreamBuffer(u32 type, u32 size);
void CreateFences();
void DeleteFences();
void AllocMemory(u32 size);
StreamBuffer(u32 type, u32 size);
void CreateFences();
void DeleteFences();
void AllocMemory(u32 size);
const u32 m_buffertype;
const u32 m_size;
const u32 m_buffertype;
const u32 m_size;
u32 m_iterator;
u32 m_used_iterator;
u32 m_free_iterator;
u32 m_iterator;
u32 m_used_iterator;
u32 m_free_iterator;
private:
static constexpr int SYNC_POINTS = 16;
int Slot(u32 x) const { return x >> m_bit_per_slot; }
const int m_bit_per_slot;
static constexpr int SYNC_POINTS = 16;
int Slot(u32 x) const { return x >> m_bit_per_slot; }
const int m_bit_per_slot;
std::array<GLsync, SYNC_POINTS> m_fences{};
std::array<GLsync, SYNC_POINTS> m_fences{};
};
}