Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 11:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix cubemap mips by overcommiting

Browse source
This commit is contained in:
Brad Davis 2016-09-19 11:52:19 -07:00
parent 5734332150
commit 88bbb2faa8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -126,6 +126,11 @@ void SparseInfo::update() {
return; return;
} }
glGetTextureParameterIuiv(_texture._id, GL_NUM_SPARSE_LEVELS_ARB, &_maxSparseLevel); glGetTextureParameterIuiv(_texture._id, GL_NUM_SPARSE_LEVELS_ARB, &_maxSparseLevel);
// For some reason the long mip tail isn't working properly with cubemaps unless
// I extend one more level
if (GL_TEXTURE_CUBE_MAP == _texture._target) {
++_maxSparseLevel;
}
_pageBytes = _texture._gpuObject.getTexelFormat().getSize(); _pageBytes = _texture._gpuObject.getTexelFormat().getSize();
_pageBytes *= _pageDimensions.x * _pageDimensions.y * _pageDimensions.z; _pageBytes *= _pageDimensions.x * _pageDimensions.y * _pageDimensions.z;
@ -253,10 +258,7 @@ GL45Texture::GL45Texture(const std::weak_ptr<GLBackend>& backend, const Texture&
} }
} }
// Destructors get called on the main thread, potentially without a context active. We need to queue the
// deallocation of the sparse pages for this content.
GL45Texture::~GL45Texture() { GL45Texture::~GL45Texture() {
if (_sparseInfo._sparse) { if (_sparseInfo._sparse) {
auto backend = _backend.lock(); auto backend = _backend.lock();
if (backend) { if (backend) {
@ -277,6 +279,8 @@ GL45Texture::~GL45Texture() {
uint8_t maxFace = (uint8_t)((_target == GL_TEXTURE_CUBE_MAP) ? GLTexture::CUBE_NUM_FACES : 1); uint8_t maxFace = (uint8_t)((_target == GL_TEXTURE_CUBE_MAP) ? GLTexture::CUBE_NUM_FACES : 1);
for (uint16_t mipLevel = _minMip; mipLevel <= maxSparseMip; ++mipLevel) { for (uint16_t mipLevel = _minMip; mipLevel <= maxSparseMip; ++mipLevel) {
auto mipDimensions = _gpuObject.evalMipDimensions(mipLevel); auto mipDimensions = _gpuObject.evalMipDimensions(mipLevel);
// Destructors get called on the main thread, potentially without a context active.
// We need to queue the deallocation of the sparse pages for this content.
backend->releaseLambda([=] { backend->releaseLambda([=] {
glTexturePageCommitmentEXT(id, mipLevel, 0, 0, 0, mipDimensions.x, mipDimensions.y, maxFace, GL_FALSE); glTexturePageCommitmentEXT(id, mipLevel, 0, 0, 0, mipDimensions.x, mipDimensions.y, maxFace, GL_FALSE);
}); });