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

Support loading multiple mips in texture transfer

Browse source
This commit is contained in:
Brad Davis 2016-04-15 01:02:28 -07:00
parent ac3d6c77b9
commit 0d3bf366c1
2 changed files with 44 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
libraries/gpu/src/gpu/GLBackend.h
View file

@ -139,7 +139,7 @@ public:
GLuint _virtualSize; // theorical size as expected GLuint _virtualSize; // theorical size as expected
GLuint _numLevels{ 0 }; GLuint _numLevels{ 0 };
void transferMip(GLenum target, const Texture::PixelsPointer& mip) const; void transferMip(uint16_t mipLevel, uint8_t face = 0) const;
// The owning texture // The owning texture
const Texture& _gpuTexture; const Texture& _gpuTexture;

73
libraries/gpu/src/gpu/GLBackendTexture.cpp
View file

@ -52,8 +52,7 @@ GLBackend::GLTexture::GLTexture(const Texture& texture) :
_target(gpuToGLTextureType(texture)), _target(gpuToGLTextureType(texture)),
_size(0), _size(0),
_virtualSize(0), _virtualSize(0),
_numLevels(1), _numLevels(texture.maxMip() + 1),
//_numLevels(texture.maxMip() + 1),
_gpuTexture(texture) _gpuTexture(texture)
{ {
Backend::incrementTextureGPUCount(); Backend::incrementTextureGPUCount();
@ -94,25 +93,22 @@ void GLBackend::GLTexture::createTexture() {
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
// Fixme: this usage of TexStorage doesn;t work wtih compressed texture, altuogh it should. // Fixme: this usage of TexStorage doesn;t work wtih compressed texture, altuogh it should.
// GO through the process of allocating the correct storage // GO through the process of allocating the correct storage
/* if (GLEW_VERSION_4_2 && !texture.getTexelFormat().isCompressed()) { if (GLEW_VERSION_4_2 && !_gpuTexture.getTexelFormat().isCompressed()) {
glTexStorage2D(_target, _numLevels, texelFormat.internalFormat, width, height); glTexStorage2D(_target, _numLevels, texelFormat.internalFormat, width, height);
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} else*/ } else {
{
glTexParameteri(_target, GL_TEXTURE_BASE_LEVEL, 0); glTexParameteri(_target, GL_TEXTURE_BASE_LEVEL, 0);
glTexParameteri(_target, GL_TEXTURE_MAX_LEVEL, _numLevels - 1); glTexParameteri(_target, GL_TEXTURE_MAX_LEVEL, _numLevels - 1);
for (uint16_t l = 0; l < _numLevels; l++) {
// for (int l = 0; l < _numLevels; l++) { if (_gpuTexture.getType() == gpu::Texture::TEX_CUBE) {
{ int l = 0; for (size_t face = 0; face < CUBE_NUM_FACES; face++) {
if (_gpuTexture.getType() == gpu::Texture::TEX_CUBE) { glTexImage2D(CUBE_FACE_LAYOUT[face], l, texelFormat.internalFormat, width, height, 0, texelFormat.format, texelFormat.type, NULL);
for (size_t face = 0; face < CUBE_NUM_FACES; face++) { }
glTexImage2D(CUBE_FACE_LAYOUT[face], l, texelFormat.internalFormat, width, height, 0, texelFormat.format, texelFormat.type, NULL); } else {
glTexImage2D(_target, l, texelFormat.internalFormat, width, height, 0, texelFormat.format, texelFormat.type, NULL);
} }
} else { width = std::max(1, (width / 2));
glTexImage2D(_target, l, texelFormat.internalFormat, width, height, 0, texelFormat.format, texelFormat.type, NULL); height = std::max(1, (height / 2));
}
width = std::max(1, (width / 2));
height = std::max(1, (height / 2));
} }
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
@ -214,9 +210,13 @@ bool GLBackend::GLTexture::isReady() const {
} }
// Move content bits from the CPU to the GPU for a given mip / face // Move content bits from the CPU to the GPU for a given mip / face
void GLBackend::GLTexture::transferMip(GLenum target, const Texture::PixelsPointer& mip) const { void GLBackend::GLTexture::transferMip(uint16_t mipLevel, uint8_t face) const {
auto mip = _gpuTexture.accessStoredMipFace(mipLevel, face);
GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuTexture.getTexelFormat(), mip->getFormat()); GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_gpuTexture.getTexelFormat(), mip->getFormat());
glTexSubImage2D(target, 0, 0, 0, _gpuTexture.getWidth(), _gpuTexture.getHeight(), texelFormat.format, texelFormat.type, mip->readData()); GLenum target = _target == GL_TEXTURE_2D ? GL_TEXTURE_2D : CUBE_FACE_LAYOUT[face];
uvec2 size = uvec2(_gpuTexture.getWidth(), _gpuTexture.getHeight());
size >>= mipLevel;
glTexSubImage2D(target, mipLevel, 0, 0, size.x, size.y, texelFormat.format, texelFormat.type, mip->readData());
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
@ -235,16 +235,20 @@ void GLBackend::GLTexture::transfer() const {
// GO through the process of allocating the correct storage and/or update the content // GO through the process of allocating the correct storage and/or update the content
switch (_gpuTexture.getType()) { switch (_gpuTexture.getType()) {
case Texture::TEX_2D: case Texture::TEX_2D:
if (_gpuTexture.isStoredMipFaceAvailable(0)) { for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
transferMip(GL_TEXTURE_2D, _gpuTexture.accessStoredMipFace(0)); if (_gpuTexture.isStoredMipFaceAvailable(i)) {
transferMip(i);
}
} }
break; break;
case Texture::TEX_CUBE: case Texture::TEX_CUBE:
// transfer pixels from each faces // transfer pixels from each faces
for (uint8_t f = 0; f < CUBE_NUM_FACES; f++) { for (uint8_t f = 0; f < CUBE_NUM_FACES; f++) {
if (_gpuTexture.isStoredMipFaceAvailable(0, f)) { for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
transferMip(CUBE_FACE_LAYOUT[f], _gpuTexture.accessStoredMipFace(0, f)); if (_gpuTexture.isStoredMipFaceAvailable(i, f)) {
transferMip(i, f);
}
} }
} }
break; break;
@ -255,7 +259,7 @@ void GLBackend::GLTexture::transfer() const {
} }
if (_gpuTexture.isAutogenerateMips()) { if (_gpuTexture.isAutogenerateMips()) {
//glGenerateMipmap(_target); glGenerateMipmap(_target);
(void)CHECK_GL_ERROR(); (void)CHECK_GL_ERROR();
} }
} }
@ -270,12 +274,21 @@ void GLBackend::GLTexture::postTransfer() {
// At this point the mip pixels have been loaded, we can notify the gpu texture to abandon it's memory // At this point the mip pixels have been loaded, we can notify the gpu texture to abandon it's memory
switch (_gpuTexture.getType()) { switch (_gpuTexture.getType()) {
case Texture::TEX_2D: case Texture::TEX_2D:
_gpuTexture.notifyMipFaceGPULoaded(0, 0); for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
if (_gpuTexture.isStoredMipFaceAvailable(i)) {
_gpuTexture.notifyMipFaceGPULoaded(i);
}
}
break; break;
case Texture::TEX_CUBE: case Texture::TEX_CUBE:
for (uint8_t f = 0; f < CUBE_NUM_FACES; ++f) { // transfer pixels from each faces
_gpuTexture.notifyMipFaceGPULoaded(0, f); for (uint8_t f = 0; f < CUBE_NUM_FACES; f++) {
for (uint16_t i = 0; i < Sampler::MAX_MIP_LEVEL; ++i) {
if (_gpuTexture.isStoredMipFaceAvailable(i, f)) {
_gpuTexture.notifyMipFaceGPULoaded(i, f);
}
}
} }
break; break;
@ -346,7 +359,7 @@ GLuint GLBackend::getTextureID(const TexturePointer& texture, bool sync) {
} else { } else {
object = Backend::getGPUObject<GLBackend::GLTexture>(*texture); object = Backend::getGPUObject<GLBackend::GLTexture>(*texture);
} }
if (object) { if (object && object->getSyncState() == GLTexture::Idle) {
return object->_texture; return object->_texture;
} else { } else {
return 0; return 0;
@ -436,7 +449,7 @@ void GLBackend::do_generateTextureMips(Batch& batch, size_t paramOffset) {
glActiveTexture(GL_TEXTURE0 + bindingSlot); glActiveTexture(GL_TEXTURE0 + bindingSlot);
glBindTexture(object->_target, object->_texture); glBindTexture(object->_target, object->_texture);
//glGenerateMipmap(object->_target); glGenerateMipmap(object->_target);
if (freeSlot < 0) { if (freeSlot < 0) {
// If had to use slot 0 then restore state // If had to use slot 0 then restore state