mirror of
https://github.com/overte-org/overte.git
synced 2025-07-23 19:04:27 +02:00
Don't hold KTX files open for longer than transfers require
This commit is contained in:
parent
e5326d146e
commit
f764cd614b
10 changed files with 209 additions and 107 deletions
|
@ -222,6 +222,7 @@ GL45StrictResourceTexture::GL45StrictResourceTexture(const std::weak_ptr<GLBacke
|
||||||
copyMipFaceFromTexture(sourceMip, targetMip, face);
|
copyMipFaceFromTexture(sourceMip, targetMip, face);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
_gpuObject.finishTransfer();
|
||||||
if (texture.isAutogenerateMips()) {
|
if (texture.isAutogenerateMips()) {
|
||||||
generateMips();
|
generateMips();
|
||||||
}
|
}
|
||||||
|
|
|
@ -85,14 +85,14 @@ TransferJob::TransferJob(const GL45VariableAllocationTexture& parent, uint16_t s
|
||||||
auto transferDimensions = _parent._gpuObject.evalMipDimensions(sourceMip);
|
auto transferDimensions = _parent._gpuObject.evalMipDimensions(sourceMip);
|
||||||
GLenum format;
|
GLenum format;
|
||||||
GLenum type;
|
GLenum type;
|
||||||
auto mipData = _parent._gpuObject.accessStoredMipFace(sourceMip, face);
|
|
||||||
GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_parent._gpuObject.getTexelFormat(), _parent._gpuObject.getStoredMipFormat());
|
GLTexelFormat texelFormat = GLTexelFormat::evalGLTexelFormat(_parent._gpuObject.getTexelFormat(), _parent._gpuObject.getStoredMipFormat());
|
||||||
format = texelFormat.format;
|
format = texelFormat.format;
|
||||||
type = texelFormat.type;
|
type = texelFormat.type;
|
||||||
|
|
||||||
if (0 == lines) {
|
if (0 == lines) {
|
||||||
_transferSize = mipData->getSize();
|
|
||||||
_bufferingLambda = [=] {
|
_bufferingLambda = [=] {
|
||||||
|
auto mipData = _parent._gpuObject.accessStoredMipFace(sourceMip, face);
|
||||||
|
_transferSize = mipData->getSize();
|
||||||
_buffer.resize(_transferSize);
|
_buffer.resize(_transferSize);
|
||||||
memcpy(&_buffer[0], mipData->readData(), _transferSize);
|
memcpy(&_buffer[0], mipData->readData(), _transferSize);
|
||||||
_bufferingCompleted = true;
|
_bufferingCompleted = true;
|
||||||
|
@ -100,12 +100,13 @@ TransferJob::TransferJob(const GL45VariableAllocationTexture& parent, uint16_t s
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
transferDimensions.y = lines;
|
transferDimensions.y = lines;
|
||||||
|
_bufferingLambda = [=] {
|
||||||
|
auto mipData = _parent._gpuObject.accessStoredMipFace(sourceMip, face);
|
||||||
auto dimensions = _parent._gpuObject.evalMipDimensions(sourceMip);
|
auto dimensions = _parent._gpuObject.evalMipDimensions(sourceMip);
|
||||||
auto mipSize = mipData->getSize();
|
auto mipSize = mipData->getSize();
|
||||||
auto bytesPerLine = (uint32_t)mipSize / dimensions.y;
|
auto bytesPerLine = (uint32_t)mipSize / dimensions.y;
|
||||||
_transferSize = bytesPerLine * lines;
|
_transferSize = bytesPerLine * lines;
|
||||||
auto sourceOffset = bytesPerLine * lineOffset;
|
auto sourceOffset = bytesPerLine * lineOffset;
|
||||||
_bufferingLambda = [=] {
|
|
||||||
_buffer.resize(_transferSize);
|
_buffer.resize(_transferSize);
|
||||||
memcpy(&_buffer[0], mipData->readData() + sourceOffset, _transferSize);
|
memcpy(&_buffer[0], mipData->readData() + sourceOffset, _transferSize);
|
||||||
_bufferingCompleted = true;
|
_bufferingCompleted = true;
|
||||||
|
@ -430,6 +431,7 @@ void GL45VariableAllocationTexture::executeNextTransfer(const TexturePointer& cu
|
||||||
_currentTransferTexture = currentTexture;
|
_currentTransferTexture = currentTexture;
|
||||||
if (_pendingTransfers.front()->tryTransfer()) {
|
if (_pendingTransfers.front()->tryTransfer()) {
|
||||||
_pendingTransfers.pop();
|
_pendingTransfers.pop();
|
||||||
|
_currentTransferTexture->finishTransfer();
|
||||||
_currentTransferTexture.reset();
|
_currentTransferTexture.reset();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -454,7 +456,7 @@ GL45ResourceTexture::GL45ResourceTexture(const std::weak_ptr<GLBackend>& backend
|
||||||
_memoryPressureStateStale = true;
|
_memoryPressureStateStale = true;
|
||||||
copyMipsFromTexture();
|
copyMipsFromTexture();
|
||||||
syncSampler();
|
syncSampler();
|
||||||
|
_gpuObject.finishTransfer();
|
||||||
}
|
}
|
||||||
|
|
||||||
void GL45ResourceTexture::allocateStorage(uint16 allocatedMip) {
|
void GL45ResourceTexture::allocateStorage(uint16 allocatedMip) {
|
||||||
|
@ -585,10 +587,10 @@ void GL45ResourceTexture::populateTransferQueue() {
|
||||||
|
|
||||||
// break down the transfers into chunks so that no single transfer is
|
// break down the transfers into chunks so that no single transfer is
|
||||||
// consuming more than X bandwidth
|
// consuming more than X bandwidth
|
||||||
auto mipData = _gpuObject.accessStoredMipFace(sourceMip, face);
|
auto mipSize = _gpuObject.getStoredMipFaceSize(sourceMip, face);
|
||||||
const auto lines = mipDimensions.y;
|
const auto lines = mipDimensions.y;
|
||||||
auto bytesPerLine = (uint32_t)mipData->getSize() / lines;
|
auto bytesPerLine = mipSize / lines;
|
||||||
Q_ASSERT(0 == (mipData->getSize() % lines));
|
Q_ASSERT(0 == (mipSize % lines));
|
||||||
uint32_t linesPerTransfer = (uint32_t)(MAX_TRANSFER_SIZE / bytesPerLine);
|
uint32_t linesPerTransfer = (uint32_t)(MAX_TRANSFER_SIZE / bytesPerLine);
|
||||||
uint32_t lineOffset = 0;
|
uint32_t lineOffset = 0;
|
||||||
while (lineOffset < lines) {
|
while (lineOffset < lines) {
|
||||||
|
|
|
@ -149,6 +149,10 @@ PixelsPointer MemoryStorage::getMipFace(uint16 level, uint8 face) const {
|
||||||
return PixelsPointer();
|
return PixelsPointer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Size MemoryStorage::getMipFaceSize(uint16 level, uint8 face) const {
|
||||||
|
return getMipFace(level, face)->getSize();
|
||||||
|
}
|
||||||
|
|
||||||
bool MemoryStorage::isMipAvailable(uint16 level, uint8 face) const {
|
bool MemoryStorage::isMipAvailable(uint16 level, uint8 face) const {
|
||||||
PixelsPointer mipFace = getMipFace(level, face);
|
PixelsPointer mipFace = getMipFace(level, face);
|
||||||
return (mipFace && mipFace->getSize());
|
return (mipFace && mipFace->getSize());
|
||||||
|
@ -980,3 +984,9 @@ Texture::ExternalUpdates Texture::getUpdates() const {
|
||||||
void Texture::setStorage(std::unique_ptr<Storage>& newStorage) {
|
void Texture::setStorage(std::unique_ptr<Storage>& newStorage) {
|
||||||
_storage.swap(newStorage);
|
_storage.swap(newStorage);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Texture::finishTransfer() const {
|
||||||
|
if (_storage) {
|
||||||
|
_storage->releaseTempResources();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
@ -25,6 +25,8 @@
|
||||||
namespace ktx {
|
namespace ktx {
|
||||||
class KTX;
|
class KTX;
|
||||||
using KTXUniquePointer = std::unique_ptr<KTX>;
|
using KTXUniquePointer = std::unique_ptr<KTX>;
|
||||||
|
struct KTXDescriptor;
|
||||||
|
using KTXDescriptorPointer = std::unique_ptr<KTXDescriptor>;
|
||||||
struct Header;
|
struct Header;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -261,9 +263,11 @@ public:
|
||||||
|
|
||||||
virtual void reset() = 0;
|
virtual void reset() = 0;
|
||||||
virtual PixelsPointer getMipFace(uint16 level, uint8 face = 0) const = 0;
|
virtual PixelsPointer getMipFace(uint16 level, uint8 face = 0) const = 0;
|
||||||
|
virtual Size getMipFaceSize(uint16 level, uint8 face = 0) const = 0;
|
||||||
virtual void assignMipData(uint16 level, const storage::StoragePointer& storage) = 0;
|
virtual void assignMipData(uint16 level, const storage::StoragePointer& storage) = 0;
|
||||||
virtual void assignMipFaceData(uint16 level, uint8 face, const storage::StoragePointer& storage) = 0;
|
virtual void assignMipFaceData(uint16 level, uint8 face, const storage::StoragePointer& storage) = 0;
|
||||||
virtual bool isMipAvailable(uint16 level, uint8 face = 0) const = 0;
|
virtual bool isMipAvailable(uint16 level, uint8 face = 0) const = 0;
|
||||||
|
virtual void releaseTempResources() const {}
|
||||||
Texture::Type getType() const { return _type; }
|
Texture::Type getType() const { return _type; }
|
||||||
|
|
||||||
Stamp getStamp() const { return _stamp; }
|
Stamp getStamp() const { return _stamp; }
|
||||||
|
@ -286,6 +290,7 @@ public:
|
||||||
public:
|
public:
|
||||||
void reset() override;
|
void reset() override;
|
||||||
PixelsPointer getMipFace(uint16 level, uint8 face = 0) const override;
|
PixelsPointer getMipFace(uint16 level, uint8 face = 0) const override;
|
||||||
|
Size getMipFaceSize(uint16 level, uint8 face = 0) const override;
|
||||||
void assignMipData(uint16 level, const storage::StoragePointer& storage) override;
|
void assignMipData(uint16 level, const storage::StoragePointer& storage) override;
|
||||||
void assignMipFaceData(uint16 level, uint8 face, const storage::StoragePointer& storage) override;
|
void assignMipFaceData(uint16 level, uint8 face, const storage::StoragePointer& storage) override;
|
||||||
bool isMipAvailable(uint16 level, uint8 face = 0) const override;
|
bool isMipAvailable(uint16 level, uint8 face = 0) const override;
|
||||||
|
@ -297,8 +302,9 @@ public:
|
||||||
|
|
||||||
class KtxStorage : public Storage {
|
class KtxStorage : public Storage {
|
||||||
public:
|
public:
|
||||||
KtxStorage(ktx::KTXUniquePointer& ktxData);
|
KtxStorage(const std::string& filename);
|
||||||
PixelsPointer getMipFace(uint16 level, uint8 face = 0) const override;
|
PixelsPointer getMipFace(uint16 level, uint8 face = 0) const override;
|
||||||
|
Size getMipFaceSize(uint16 level, uint8 face = 0) const override;
|
||||||
// By convention, all mip levels and faces MUST be populated when using KTX backing
|
// By convention, all mip levels and faces MUST be populated when using KTX backing
|
||||||
bool isMipAvailable(uint16 level, uint8 face = 0) const override { return true; }
|
bool isMipAvailable(uint16 level, uint8 face = 0) const override { return true; }
|
||||||
|
|
||||||
|
@ -310,9 +316,12 @@ public:
|
||||||
throw std::runtime_error("Invalid call");
|
throw std::runtime_error("Invalid call");
|
||||||
}
|
}
|
||||||
void reset() override { }
|
void reset() override { }
|
||||||
|
void releaseTempResources() const override { _ktxData.release(); }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
ktx::KTXUniquePointer _ktxData;
|
std::string _filename;
|
||||||
|
ktx::KTXDescriptorPointer _ktxDescriptor;
|
||||||
|
mutable ktx::KTXUniquePointer _ktxData;
|
||||||
friend class Texture;
|
friend class Texture;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -478,9 +487,10 @@ public:
|
||||||
// Access the the sub mips
|
// Access the the sub mips
|
||||||
bool isStoredMipFaceAvailable(uint16 level, uint8 face = 0) const { return _storage->isMipAvailable(level, face); }
|
bool isStoredMipFaceAvailable(uint16 level, uint8 face = 0) const { return _storage->isMipAvailable(level, face); }
|
||||||
const PixelsPointer accessStoredMipFace(uint16 level, uint8 face = 0) const { return _storage->getMipFace(level, face); }
|
const PixelsPointer accessStoredMipFace(uint16 level, uint8 face = 0) const { return _storage->getMipFace(level, face); }
|
||||||
|
Size getStoredMipFaceSize(uint16 level, uint8 face = 0) const { return _storage->getMipFaceSize(level, face); }
|
||||||
|
|
||||||
void setStorage(std::unique_ptr<Storage>& newStorage);
|
void setStorage(std::unique_ptr<Storage>& newStorage);
|
||||||
void setKtxBacking(ktx::KTXUniquePointer& newBacking);
|
void setKtxBacking(const std::string& filename);
|
||||||
|
|
||||||
// access sizes for the stored mips
|
// access sizes for the stored mips
|
||||||
uint16 getStoredMipWidth(uint16 level) const;
|
uint16 getStoredMipWidth(uint16 level) const;
|
||||||
|
@ -516,6 +526,8 @@ public:
|
||||||
|
|
||||||
ExternalUpdates getUpdates() const;
|
ExternalUpdates getUpdates() const;
|
||||||
|
|
||||||
|
void finishTransfer() const;
|
||||||
|
|
||||||
// Textures can be serialized directly to ktx data file, here is how
|
// Textures can be serialized directly to ktx data file, here is how
|
||||||
static ktx::KTXUniquePointer serialize(const Texture& texture);
|
static ktx::KTXUniquePointer serialize(const Texture& texture);
|
||||||
static Texture* unserialize(const ktx::KTXUniquePointer& srcData, TextureUsageType usageType = TextureUsageType::RESOURCE, Usage usage = Usage(), const Sampler::Desc& sampler = Sampler::Desc());
|
static Texture* unserialize(const ktx::KTXUniquePointer& srcData, TextureUsageType usageType = TextureUsageType::RESOURCE, Usage usage = Usage(), const Sampler::Desc& sampler = Sampler::Desc());
|
||||||
|
|
|
@ -42,30 +42,33 @@ struct GPUKTXPayload {
|
||||||
|
|
||||||
std::string GPUKTXPayload::KEY { "hifi.gpu" };
|
std::string GPUKTXPayload::KEY { "hifi.gpu" };
|
||||||
|
|
||||||
KtxStorage::KtxStorage(ktx::KTXUniquePointer& ktxData) {
|
KtxStorage::KtxStorage(const std::string& filename) : _filename(filename) {
|
||||||
|
ktx::StoragePointer storage { new storage::FileStorage(_filename.c_str()) };
|
||||||
// if the source ktx is valid let's config this KtxStorage correctly
|
auto ktxPointer = ktx::KTX::create(storage);
|
||||||
if (ktxData && ktxData->getHeader()) {
|
_ktxDescriptor.reset(new ktx::KTXDescriptor(ktxPointer->toDescriptor()));
|
||||||
|
|
||||||
// now that we know the ktx, let's get the header info to configure this Texture::Storage:
|
// now that we know the ktx, let's get the header info to configure this Texture::Storage:
|
||||||
Format mipFormat = Format::COLOR_BGRA_32;
|
Format mipFormat = Format::COLOR_BGRA_32;
|
||||||
Format texelFormat = Format::COLOR_SRGBA_32;
|
Format texelFormat = Format::COLOR_SRGBA_32;
|
||||||
if (Texture::evalTextureFormat(*ktxData->getHeader(), mipFormat, texelFormat)) {
|
if (Texture::evalTextureFormat(_ktxDescriptor->header, mipFormat, texelFormat)) {
|
||||||
_format = mipFormat;
|
_format = mipFormat;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
_ktxData.reset(ktxData.release());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PixelsPointer KtxStorage::getMipFace(uint16 level, uint8 face) const {
|
PixelsPointer KtxStorage::getMipFace(uint16 level, uint8 face) const {
|
||||||
|
if (!_ktxData) {
|
||||||
|
ktx::StoragePointer storage { new storage::FileStorage(_filename.c_str()) };
|
||||||
|
_ktxData = _ktxDescriptor->toKTX(storage);
|
||||||
|
}
|
||||||
return _ktxData->getMipFaceTexelsData(level, face);
|
return _ktxData->getMipFaceTexelsData(level, face);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Texture::setKtxBacking(ktx::KTXUniquePointer& ktxBacking) {
|
Size KtxStorage::getMipFaceSize(uint16 level, uint8 face) const {
|
||||||
auto newBacking = std::unique_ptr<Storage>(new KtxStorage(ktxBacking));
|
return _ktxDescriptor->getMipFaceTexelsSize(level, face);
|
||||||
|
}
|
||||||
|
|
||||||
|
void Texture::setKtxBacking(const std::string& filename) {
|
||||||
|
auto newBacking = std::unique_ptr<Storage>(new KtxStorage(filename));
|
||||||
setStorage(newBacking);
|
setStorage(newBacking);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -181,7 +184,7 @@ Texture* Texture::unserialize(const ktx::KTXUniquePointer& srcData, TextureUsage
|
||||||
if (!srcData) {
|
if (!srcData) {
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
const auto& header = *srcData->getHeader();
|
const auto& header = srcData->getHeader();
|
||||||
|
|
||||||
Format mipFormat = Format::COLOR_BGRA_32;
|
Format mipFormat = Format::COLOR_BGRA_32;
|
||||||
Format texelFormat = Format::COLOR_SRGBA_32;
|
Format texelFormat = Format::COLOR_SRGBA_32;
|
||||||
|
|
|
@ -108,47 +108,39 @@ KTX::~KTX() {
|
||||||
|
|
||||||
void KTX::resetStorage(const StoragePointer& storage) {
|
void KTX::resetStorage(const StoragePointer& storage) {
|
||||||
_storage = storage;
|
_storage = storage;
|
||||||
|
if (_storage->size() >= sizeof(Header)) {
|
||||||
|
memcpy(&_header, _storage->data(), sizeof(Header));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
const Header* KTX::getHeader() const {
|
const Header& KTX::getHeader() const {
|
||||||
if (!_storage) {
|
return _header;
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
return reinterpret_cast<const Header*>(_storage->data());
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
size_t KTX::getKeyValueDataSize() const {
|
size_t KTX::getKeyValueDataSize() const {
|
||||||
if (_storage) {
|
return _header.bytesOfKeyValueData;
|
||||||
return getHeader()->bytesOfKeyValueData;
|
|
||||||
} else {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t KTX::getTexelsDataSize() const {
|
size_t KTX::getTexelsDataSize() const {
|
||||||
if (_storage) {
|
if (!_storage) {
|
||||||
//return _storage->size() - (sizeof(Header) + getKeyValueDataSize());
|
|
||||||
return (_storage->data() + _storage->size()) - getTexelsData();
|
|
||||||
} else {
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
return (_storage->data() + _storage->size()) - getTexelsData();
|
||||||
}
|
}
|
||||||
|
|
||||||
const Byte* KTX::getKeyValueData() const {
|
const Byte* KTX::getKeyValueData() const {
|
||||||
if (_storage) {
|
if (!_storage) {
|
||||||
return (_storage->data() + sizeof(Header));
|
|
||||||
} else {
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
return (_storage->data() + sizeof(Header));
|
||||||
}
|
}
|
||||||
|
|
||||||
const Byte* KTX::getTexelsData() const {
|
const Byte* KTX::getTexelsData() const {
|
||||||
if (_storage) {
|
if (!_storage) {
|
||||||
return (_storage->data() + sizeof(Header) + getKeyValueDataSize());
|
|
||||||
} else {
|
|
||||||
return nullptr;
|
return nullptr;
|
||||||
}
|
}
|
||||||
|
return (_storage->data() + sizeof(Header) + getKeyValueDataSize());
|
||||||
}
|
}
|
||||||
|
|
||||||
storage::StoragePointer KTX::getMipFaceTexelsData(uint16_t mip, uint8_t face) const {
|
storage::StoragePointer KTX::getMipFaceTexelsData(uint16_t mip, uint8_t face) const {
|
||||||
|
@ -163,3 +155,55 @@ storage::StoragePointer KTX::getMipFaceTexelsData(uint16_t mip, uint8_t face) co
|
||||||
}
|
}
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
size_t KTXDescriptor::getMipFaceTexelsSize(uint16_t mip, uint8_t face) const {
|
||||||
|
size_t result { 0 };
|
||||||
|
if (mip < images.size()) {
|
||||||
|
const auto& faces = images[mip];
|
||||||
|
if (face < faces._numFaces) {
|
||||||
|
result = faces._faceSize;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
ImageDescriptor Image::toImageDescriptor(const Byte* baseAddress) const {
|
||||||
|
FaceOffsets offsets;
|
||||||
|
offsets.resize(_faceBytes.size());
|
||||||
|
for (size_t face = 0; face < _numFaces; ++face) {
|
||||||
|
offsets[face] = _faceBytes[face] - baseAddress;
|
||||||
|
}
|
||||||
|
// Note, implicit cast of *this to const ImageHeader&
|
||||||
|
return ImageDescriptor(*this, offsets);
|
||||||
|
}
|
||||||
|
|
||||||
|
Image ImageDescriptor::toImage(const ktx::StoragePointer& storage) const {
|
||||||
|
FaceBytes faces;
|
||||||
|
faces.resize(_faceOffsets.size());
|
||||||
|
for (size_t face = 0; face < _numFaces; ++face) {
|
||||||
|
faces[face] = storage->data() + _faceOffsets[face];
|
||||||
|
}
|
||||||
|
// Note, implicit cast of *this to const ImageHeader&
|
||||||
|
return Image(*this, faces);
|
||||||
|
}
|
||||||
|
|
||||||
|
KTXDescriptor KTX::toDescriptor() const {
|
||||||
|
ImageDescriptors newDescriptors;
|
||||||
|
auto storageStart = _storage ? _storage->data() : nullptr;
|
||||||
|
for (size_t i = 0; i < _images.size(); ++i) {
|
||||||
|
newDescriptors.emplace_back(_images[i].toImageDescriptor(storageStart));
|
||||||
|
}
|
||||||
|
return { this->_header, this->_keyValues, newDescriptors };
|
||||||
|
}
|
||||||
|
|
||||||
|
std::unique_ptr<KTX> KTXDescriptor::toKTX(const ktx::StoragePointer& storage) const {
|
||||||
|
Images newImages;
|
||||||
|
for (size_t i = 0; i < images.size(); ++i) {
|
||||||
|
newImages.emplace_back(images[i].toImage(storage));
|
||||||
|
}
|
||||||
|
|
||||||
|
return std::unique_ptr<KTX>(new KTX { storage, header, keyValues, newImages });
|
||||||
|
}
|
||||||
|
|
||||||
|
KTX::KTX(const StoragePointer& storage, const Header& header, const KeyValues& keyValues, const Images& images)
|
||||||
|
: _storage(storage), _header(header), _keyValues(keyValues), _images(images) { }
|
|
@ -407,43 +407,69 @@ namespace ktx {
|
||||||
};
|
};
|
||||||
using KeyValues = KeyValue::KeyValues;
|
using KeyValues = KeyValue::KeyValues;
|
||||||
|
|
||||||
|
struct ImageHeader {
|
||||||
struct Image {
|
using FaceOffsets = std::vector<size_t>;
|
||||||
using FaceBytes = std::vector<const Byte*>;
|
using FaceBytes = std::vector<const Byte*>;
|
||||||
|
const uint32_t _numFaces;
|
||||||
uint32_t _numFaces{ 1 };
|
const uint32_t _imageSize;
|
||||||
uint32_t _imageSize;
|
const uint32_t _faceSize;
|
||||||
uint32_t _faceSize;
|
const uint32_t _padding;
|
||||||
uint32_t _padding;
|
ImageHeader(bool cube, uint32_t imageSize, uint32_t padding) :
|
||||||
FaceBytes _faceBytes;
|
_numFaces(cube ? NUM_CUBEMAPFACES : 1),
|
||||||
|
_imageSize(imageSize * _numFaces),
|
||||||
|
|
||||||
Image(uint32_t imageSize, uint32_t padding, const Byte* bytes) :
|
|
||||||
_numFaces(1),
|
|
||||||
_imageSize(imageSize),
|
|
||||||
_faceSize(imageSize),
|
_faceSize(imageSize),
|
||||||
_padding(padding),
|
_padding(padding) {
|
||||||
_faceBytes(1, bytes) {}
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
struct Image;
|
||||||
|
|
||||||
|
struct ImageDescriptor : public ImageHeader {
|
||||||
|
const FaceOffsets _faceOffsets;
|
||||||
|
ImageDescriptor(const ImageHeader& header, const FaceOffsets& offsets) : ImageHeader(header), _faceOffsets(offsets) {}
|
||||||
|
Image toImage(const ktx::StoragePointer& storage) const;
|
||||||
|
};
|
||||||
|
|
||||||
|
using ImageDescriptors = std::vector<ImageDescriptor>;
|
||||||
|
|
||||||
|
struct Image : public ImageHeader {
|
||||||
|
FaceBytes _faceBytes;
|
||||||
|
Image(const ImageHeader& header, const FaceBytes& faces) : ImageHeader(header), _faceBytes(faces) {}
|
||||||
|
Image(uint32_t imageSize, uint32_t padding, const Byte* bytes) :
|
||||||
|
ImageHeader(false, imageSize, padding),
|
||||||
|
_faceBytes(1, bytes) {}
|
||||||
Image(uint32_t pageSize, uint32_t padding, const FaceBytes& cubeFaceBytes) :
|
Image(uint32_t pageSize, uint32_t padding, const FaceBytes& cubeFaceBytes) :
|
||||||
_numFaces(NUM_CUBEMAPFACES),
|
ImageHeader(true, pageSize, padding)
|
||||||
_imageSize(pageSize * NUM_CUBEMAPFACES),
|
|
||||||
_faceSize(pageSize),
|
|
||||||
_padding(padding)
|
|
||||||
{
|
{
|
||||||
if (cubeFaceBytes.size() == NUM_CUBEMAPFACES) {
|
if (cubeFaceBytes.size() == NUM_CUBEMAPFACES) {
|
||||||
_faceBytes = cubeFaceBytes;
|
_faceBytes = cubeFaceBytes;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ImageDescriptor toImageDescriptor(const Byte* baseAddress) const;
|
||||||
};
|
};
|
||||||
|
|
||||||
using Images = std::vector<Image>;
|
using Images = std::vector<Image>;
|
||||||
|
|
||||||
|
class KTX;
|
||||||
|
|
||||||
|
// A KTX descriptor is a lightweight container for all the information about a serialized KTX file, but without the
|
||||||
|
// actual image / face data available.
|
||||||
|
struct KTXDescriptor {
|
||||||
|
KTXDescriptor(const Header& header, const KeyValues& keyValues, const ImageDescriptors& imageDescriptors) : header(header), keyValues(keyValues), images(imageDescriptors) {}
|
||||||
|
const Header header;
|
||||||
|
const KeyValues keyValues;
|
||||||
|
const ImageDescriptors images;
|
||||||
|
size_t getMipFaceTexelsSize(uint16_t mip = 0, uint8_t face = 0) const;
|
||||||
|
std::unique_ptr<KTX> toKTX(const ktx::StoragePointer& storage) const;
|
||||||
|
};
|
||||||
|
|
||||||
class KTX {
|
class KTX {
|
||||||
void resetStorage(const StoragePointer& src);
|
void resetStorage(const StoragePointer& src);
|
||||||
|
|
||||||
KTX();
|
KTX();
|
||||||
|
KTX(const StoragePointer& storage, const Header& header, const KeyValues& keyValues, const Images& images);
|
||||||
public:
|
public:
|
||||||
|
|
||||||
~KTX();
|
~KTX();
|
||||||
|
|
||||||
// Define a KTX object manually to write it somewhere (in a file on disk?)
|
// Define a KTX object manually to write it somewhere (in a file on disk?)
|
||||||
|
@ -475,18 +501,23 @@ namespace ktx {
|
||||||
static Images parseImages(const Header& header, size_t srcSize, const Byte* srcBytes);
|
static Images parseImages(const Header& header, size_t srcSize, const Byte* srcBytes);
|
||||||
|
|
||||||
// Access raw pointers to the main sections of the KTX
|
// Access raw pointers to the main sections of the KTX
|
||||||
const Header* getHeader() const;
|
const Header& getHeader() const;
|
||||||
|
|
||||||
const Byte* getKeyValueData() const;
|
const Byte* getKeyValueData() const;
|
||||||
const Byte* getTexelsData() const;
|
const Byte* getTexelsData() const;
|
||||||
storage::StoragePointer getMipFaceTexelsData(uint16_t mip = 0, uint8_t face = 0) const;
|
storage::StoragePointer getMipFaceTexelsData(uint16_t mip = 0, uint8_t face = 0) const;
|
||||||
const StoragePointer& getStorage() const { return _storage; }
|
const StoragePointer& getStorage() const { return _storage; }
|
||||||
|
|
||||||
|
KTXDescriptor toDescriptor() const;
|
||||||
size_t getKeyValueDataSize() const;
|
size_t getKeyValueDataSize() const;
|
||||||
size_t getTexelsDataSize() const;
|
size_t getTexelsDataSize() const;
|
||||||
|
|
||||||
|
Header _header;
|
||||||
StoragePointer _storage;
|
StoragePointer _storage;
|
||||||
KeyValues _keyValues;
|
KeyValues _keyValues;
|
||||||
Images _images;
|
Images _images;
|
||||||
|
|
||||||
|
friend struct KTXDescriptor;
|
||||||
};
|
};
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -185,10 +185,10 @@ namespace ktx {
|
||||||
result->resetStorage(src);
|
result->resetStorage(src);
|
||||||
|
|
||||||
// read metadata
|
// read metadata
|
||||||
result->_keyValues = parseKeyValues(result->getHeader()->bytesOfKeyValueData, result->getKeyValueData());
|
result->_keyValues = parseKeyValues(result->getHeader().bytesOfKeyValueData, result->getKeyValueData());
|
||||||
|
|
||||||
// populate image table
|
// populate image table
|
||||||
result->_images = parseImages(*result->getHeader(), result->getTexelsDataSize(), result->getTexelsData());
|
result->_images = parseImages(result->getHeader(), result->getTexelsDataSize(), result->getTexelsData());
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
|
@ -444,7 +444,7 @@ void NetworkTexture::loadContent(const QByteArray& content) {
|
||||||
texture.reset(gpu::Texture::unserialize(ktx));
|
texture.reset(gpu::Texture::unserialize(ktx));
|
||||||
// Ensure that the texture population worked
|
// Ensure that the texture population worked
|
||||||
if (texture) {
|
if (texture) {
|
||||||
texture->setKtxBacking(ktx);
|
texture->setKtxBacking(ktxFile->getFilepath());
|
||||||
texture = textureCache->cacheTextureByHash(hash, texture);
|
texture = textureCache->cacheTextureByHash(hash, texture);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -586,10 +586,7 @@ void ImageReader::read() {
|
||||||
qCWarning(modelnetworking) << _url << "file cache failed";
|
qCWarning(modelnetworking) << _url << "file cache failed";
|
||||||
} else {
|
} else {
|
||||||
resource.staticCast<NetworkTexture>()->_file = file;
|
resource.staticCast<NetworkTexture>()->_file = file;
|
||||||
auto fileKtx = file->getKTX();
|
texture->setKtxBacking(file->getFilepath());
|
||||||
if (fileKtx) {
|
|
||||||
texture->setKtxBacking(fileKtx);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -111,6 +111,7 @@ int main(int argc, char** argv) {
|
||||||
outFile.close();
|
outFile.close();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
{
|
||||||
auto ktxFile = ktx::KTX::create(std::shared_ptr<storage::Storage>(new storage::FileStorage(TEST_IMAGE_KTX)));
|
auto ktxFile = ktx::KTX::create(std::shared_ptr<storage::Storage>(new storage::FileStorage(TEST_IMAGE_KTX)));
|
||||||
{
|
{
|
||||||
const auto& memStorage = ktxMemory->getStorage();
|
const auto& memStorage = ktxMemory->getStorage();
|
||||||
|
@ -142,7 +143,8 @@ int main(int argc, char** argv) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
testTexture->setKtxBacking(ktxFile);
|
}
|
||||||
|
testTexture->setKtxBacking(TEST_IMAGE_KTX.toStdString());
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue