Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 12:29:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove magic numbers, ensure proper buffer size for page transfers

Browse source
This commit is contained in:
Brad Davis 2016-09-09 09:46:54 -07:00
parent 27ddd39a22
commit 017181f020
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu-gl/src/gpu/gl45/GL45Backend.h
View file

@ -36,7 +36,7 @@ struct TransferState {
uvec3 currentPageSize() const; uvec3 currentPageSize() const;
void updateSparse(); void updateSparse();
void updateMip(); void updateMip();
void populatePage(uint8_t* dest); void populatePage(std::vector<uint8_t>& dest);
bool increment(); bool increment();
TransferState(GLTexture& texture); TransferState(GLTexture& texture);
}; };

14
libraries/gpu-gl/src/gpu/gl45/GL45BackendTexture.cpp
View file

@ -26,6 +26,9 @@ using namespace gpu::gl45;
#define SPARSE_TEXTURES 1 #define SPARSE_TEXTURES 1
// Allocate 1 MB of buffer space for paged transfers
#define DEFAULT_PAGE_BUFFER_SIZE (1024*1024)
using GL45Texture = GL45Backend::GL45Texture; using GL45Texture = GL45Backend::GL45Texture;
GLTexture* GL45Backend::syncGPUObject(const TexturePointer& texture, bool transfer) { GLTexture* GL45Backend::syncGPUObject(const TexturePointer& texture, bool transfer) {
@ -102,13 +105,18 @@ bool TransferState::increment() {
} }
#define DEFAULT_GL_PIXEL_ALIGNMENT 4 #define DEFAULT_GL_PIXEL_ALIGNMENT 4
void TransferState::populatePage(uint8_t* dst) { void TransferState::populatePage(std::vector<uint8_t>& buffer) {
uvec3 pageSize = currentPageSize(); uvec3 pageSize = currentPageSize();
auto bytesPerPageLine = _bytesPerPixel * pageSize.x; auto bytesPerPageLine = _bytesPerPixel * pageSize.x;
if (0 != (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT)) { if (0 != (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT)) {
bytesPerPageLine += DEFAULT_GL_PIXEL_ALIGNMENT - (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT); bytesPerPageLine += DEFAULT_GL_PIXEL_ALIGNMENT - (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT);
assert(0 == (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT)); assert(0 == (bytesPerPageLine % DEFAULT_GL_PIXEL_ALIGNMENT));
} }
auto totalPageSize = bytesPerPageLine * pageSize.y;
if (totalPageSize > buffer.size()) {
buffer.resize(totalPageSize);
}
uint8_t* dst = &buffer[0];
for (uint32_t y = 0; y < pageSize.y; ++y) { for (uint32_t y = 0; y < pageSize.y; ++y) {
uint32_t srcOffset = (_bytesPerLine * (_mipOffset.y + y)) + (_bytesPerPixel * _mipOffset.x); uint32_t srcOffset = (_bytesPerLine * (_mipOffset.y + y)) + (_bytesPerPixel * _mipOffset.x);
uint32_t dstOffset = bytesPerPageLine * y; uint32_t dstOffset = bytesPerPageLine * y;
@ -194,7 +202,7 @@ void GL45Texture::startTransfer() {
bool GL45Texture::continueTransfer() { bool GL45Texture::continueTransfer() {
static std::vector<uint8_t> buffer; static std::vector<uint8_t> buffer;
if (buffer.empty()) { if (buffer.empty()) {
buffer.resize(1024 * 1024); buffer.resize(DEFAULT_PAGE_BUFFER_SIZE);
} }
uvec3 pageSize = _transferState.currentPageSize(); uvec3 pageSize = _transferState.currentPageSize();
uvec3 offset = _transferState._mipOffset; uvec3 offset = _transferState._mipOffset;
@ -210,7 +218,7 @@ bool GL45Texture::continueTransfer() {
if (_transferState._srcPointer) { if (_transferState._srcPointer) {
// Transfer the mip data // Transfer the mip data
_transferState.populatePage(&buffer[0]); _transferState.populatePage(buffer);
if (GL_TEXTURE_2D == _target) { if (GL_TEXTURE_2D == _target) {
glTextureSubImage2D(_id, _transferState._mipLevel, glTextureSubImage2D(_id, _transferState._mipLevel,
offset.x, offset.y, offset.x, offset.y,