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

texture memory

Browse source
This commit is contained in:
Sam Gateau 2015-02-06 12:17:51 -08:00
parent c90c0b53c3
commit e9add29af1
3 changed files with 24 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -271,7 +271,12 @@ void GLBackend::syncGPUObject(const Texture& texture) {
if (texture.isAutogenerateMips()) { if (texture.isAutogenerateMips()) {
glGenerateMipmap(GL_TEXTURE_2D); glGenerateMipmap(GL_TEXTURE_2D);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
} }
// At this point the mip piels have been loaded, we can notify
texture.notifyGPULoaded(0);
glBindTexture(GL_TEXTURE_2D, boundTex); glBindTexture(GL_TEXTURE_2D, boundTex);
object->_contentStamp = texture.getDataStamp(); object->_contentStamp = texture.getDataStamp();
} }
@ -302,6 +307,9 @@ void GLBackend::syncGPUObject(const Texture& texture) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
} }
// At this point the mip piels have been loaded, we can notify
texture.notifyGPULoaded(0);
glBindTexture(GL_TEXTURE_2D, boundTex); glBindTexture(GL_TEXTURE_2D, boundTex);
object->_storageStamp = texture.getStamp(); object->_storageStamp = texture.getStamp();
object->_size = texture.getSize(); object->_size = texture.getSize();

11
libraries/gpu/src/gpu/Texture.cpp
View file

@ -17,7 +17,8 @@ using namespace gpu;
Texture::Pixels::Pixels(const Element& format, Size size, const Byte* bytes) : Texture::Pixels::Pixels(const Element& format, Size size, const Byte* bytes) :
_sysmem(size, bytes), _sysmem(size, bytes),
_format(format) { _format(format),
_isGPULoaded(false) {
} }
Texture::Pixels::~Pixels() { Texture::Pixels::~Pixels() {
@ -53,6 +54,14 @@ const Texture::PixelsPointer Texture::Storage::getMip(uint16 level) const {
return PixelsPointer(); return PixelsPointer();
} }
void Texture::Storage::notifyGPULoaded(uint16 level) const {
PixelsPointer mip = getMip(level);
if (mip) {
mip->_isGPULoaded = true;
mip->_sysmem.resize(0);
}
}
bool Texture::Storage::isMipAvailable(uint16 level) const { bool Texture::Storage::isMipAvailable(uint16 level) const {
PixelsPointer mip = getMip(level); PixelsPointer mip = getMip(level);
return (mip && mip->_sysmem.getSize()); return (mip && mip->_sysmem.getSize());

9
libraries/gpu/src/gpu/Texture.h
View file

@ -26,8 +26,9 @@ public:
Pixels(const Element& format, Size size, const Byte* bytes); Pixels(const Element& format, Size size, const Byte* bytes);
~Pixels(); ~Pixels();
Sysmem _sysmem; mutable Sysmem _sysmem;
Element _format; Element _format;
mutable bool _isGPULoaded;
}; };
typedef QSharedPointer< Pixels > PixelsPointer; typedef QSharedPointer< Pixels > PixelsPointer;
@ -42,7 +43,8 @@ public:
virtual bool allocateMip(uint16 level); virtual bool allocateMip(uint16 level);
virtual bool assignMipData(uint16 level, const Element& format, Size size, const Byte* bytes); virtual bool assignMipData(uint16 level, const Element& format, Size size, const Byte* bytes);
virtual bool isMipAvailable(uint16 level) const; virtual bool isMipAvailable(uint16 level) const;
virtual void notifyGPULoaded(uint16 level) const;
protected: protected:
Texture* _texture; Texture* _texture;
std::vector<PixelsPointer> _mips; std::vector<PixelsPointer> _mips;
@ -168,7 +170,8 @@ public:
// Access the the sub mips // Access the the sub mips
bool isStoredMipAvailable(uint16 level) const { return _storage->isMipAvailable(level); } bool isStoredMipAvailable(uint16 level) const { return _storage->isMipAvailable(level); }
const PixelsPointer accessStoredMip(uint16 level) const { return _storage->getMip(level); } const PixelsPointer accessStoredMip(uint16 level) const { return _storage->getMip(level); }
void notifyGPULoaded(uint16 level) const { return _storage->notifyGPULoaded(level); }
// access sizes for the stored mips // access sizes for the stored mips
uint16 getStoredMipWidth(uint16 level) const; uint16 getStoredMipWidth(uint16 level) const;
uint16 getStoredMipHeight(uint16 level) const; uint16 getStoredMipHeight(uint16 level) const;