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

Still trying to fix OSX build

Browse source
This commit is contained in:
Brad Davis 2017-03-07 17:21:54 -08:00
parent 62fcd238ae
commit 399270d243
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -389,14 +389,12 @@ const Element& Texture::getStoredMipFormat() const {
} }
void Texture::assignStoredMip(uint16 level, Size size, const Byte* bytes) { void Texture::assignStoredMip(uint16 level, Size size, const Byte* bytes) {
auto rawStoragePointer = new storage::MemoryStorage(size, bytes); storage::StoragePointer storage = std::make_shared<storage::MemoryStorage>(size, bytes);
storage::StoragePointer storage = rawStoragePointer->shared_from_this();
assignStoredMip(level, storage); assignStoredMip(level, storage);
} }
void Texture::assignStoredMipFace(uint16 level, uint8 face, Size size, const Byte* bytes) { void Texture::assignStoredMipFace(uint16 level, uint8 face, Size size, const Byte* bytes) {
auto rawStoragePointer = new storage::MemoryStorage(size, bytes); storage::StoragePointer storage = std::make_shared<storage::MemoryStorage>(size, bytes);
storage::StoragePointer storage = rawStoragePointer->shared_from_this();
assignStoredMipFace(level, face, storage); assignStoredMipFace(level, face, storage);
} }

7
libraries/shared/src/shared/Storage.cpp
View file

@ -23,13 +23,11 @@ StoragePointer Storage::createView(size_t viewSize, size_t offset) const {
if ((viewSize + offset) > selfSize) { if ((viewSize + offset) > selfSize) {
throw std::runtime_error("Invalid mapping range"); throw std::runtime_error("Invalid mapping range");
} }
auto viewPointer = new ViewStorage(shared_from_this(), viewSize, data() + offset); return std::make_shared<ViewStorage>(shared_from_this(), viewSize, data() + offset);
return viewPointer->shared_from_this();
} }
StoragePointer Storage::toMemoryStorage() const { StoragePointer Storage::toMemoryStorage() const {
auto rawPointer = new MemoryStorage(size(), data()); return std::make_shared<MemoryStorage>(size(), data());
return rawPointer->shared_from_this();
} }
StoragePointer Storage::toFileStorage(const QString& filename) const { StoragePointer Storage::toFileStorage(const QString& filename) const {
@ -62,7 +60,6 @@ StoragePointer FileStorage::create(const QString& filename, size_t size, const u
} }
} }
file.close(); file.close();
//return FileStoragePointer(new FileStorage(filename));
return std::make_shared<FileStorage>(filename); return std::make_shared<FileStorage>(filename);
} }