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

Removing invalid comments

Browse source
This commit is contained in:
Brad Davis 2016-09-15 12:40:32 -07:00
parent 70ec9783fa
commit 26a06b2914
1 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -133,8 +133,6 @@ uvec3 SparseInfo::getPageCounts(const uvec3& dimensions) const {
auto result = (dimensions / _pageDimensions) + auto result = (dimensions / _pageDimensions) +
glm::clamp(dimensions % _pageDimensions, glm::uvec3(0), glm::uvec3(1)); glm::clamp(dimensions % _pageDimensions, glm::uvec3(0), glm::uvec3(1));
return result; return result;
} }
uint32_t SparseInfo::getPageCount(const uvec3& dimensions) const { uint32_t SparseInfo::getPageCount(const uvec3& dimensions) const {
@ -323,17 +321,13 @@ bool GL45Texture::continueTransfer() {
if (buffer.empty()) { if (buffer.empty()) {
buffer.resize(DEFAULT_PAGE_BUFFER_SIZE); buffer.resize(DEFAULT_PAGE_BUFFER_SIZE);
} }
uvec3 pageSize = _transferState.currentPageSize(); const uvec3 pageSize = _transferState.currentPageSize();
uvec3 offset = _transferState._mipOffset; const uvec3& offset = _transferState._mipOffset;
// FIXME we should be using the DSA for all of this
if (_sparseInfo._sparse && _transferState._mipLevel <= _sparseInfo._maxSparseLevel) { if (_sparseInfo._sparse && _transferState._mipLevel <= _sparseInfo._maxSparseLevel) {
if (_allocatedPages > _sparseInfo._maxPages) { if (_allocatedPages > _sparseInfo._maxPages) {
qDebug() << "Exceeded max page allocation!"; qWarning() << "Exceeded max page allocation!";
} }
//glBindTexture(_target, _id);
// FIXME we should be using glTexturePageCommitmentEXT, but for some reason it causes out of memory errors.
// Either I'm not understanding how it should work or there's a driver bug.
glTexturePageCommitmentEXT(_id, _transferState._mipLevel, glTexturePageCommitmentEXT(_id, _transferState._mipLevel,
offset.x, offset.y, _transferState._face, offset.x, offset.y, _transferState._face,
pageSize.x, pageSize.y, pageSize.z, pageSize.x, pageSize.y, pageSize.z,