mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-12 22:50:13 -06:00
* Simplest possible PBO implementation. * Add PBO class * TileLoadJob owns raw tile data * Working on a soluton to cache textures and reuse them * PBO and cached textures working for one texture type. Color textures. * Threadpool for tile requests uses LRU cache as queue * Remove framesUntilRequestFlush * Clean up * Clean up * Use prioritizing concurrent job manager * Use TileTextureInitData to initialize RawTileDataReader. * Class TextureContainer owns the textures to use for tiles. * Using TileTextureInitData to determine if new caches need to be created. * Remove WriteDataDescription * Remove TileDataLayout * Rendering many different layer types again * TileProviderByLevel gives layergroup id to tile providers * Comment away use of PBO * Erase unfinished requests to make room for new ones * Enable choice of PBO or not. * Enable resetting of asynctiledataprovider * Add the ability to use PBO and also load to CPU * Update ghoul * Solve culling issue. * Texture pointer of Tile is now a raw pointer. Currently break single image tile provider and text tile provider. * Add gpudata * Move fetching of shader preprocessing data to LayerManager * No comparisons to determine shader recompilation. * Show the tile cache size in the GUI * Clean up and comment. * Solve bug where float is interpreted as NaN * Enable ability to blend between layers again * Fix single image provider * Fix windows build error * Fix OSX compile issue. * Some clean up * Showing correct texture data size * Enable use of text tile providers again. No backgroupd image path however. * Change cache size from GUI * Clean up * Solve osx compilation error. * Update ghoul * Make it possible to switch between PBO and not during runtime. * Enable resetting of tile datasets * change function module in moduleengine to identify module by name * MemoryAwareTileCache is no longer a singleton * Update ownership of properties for globe browsing * Logging info about resetting tile reader. * Logging info * Fix requested changes * Fix some compile warnings. * Fix compilation warnings * Add ability to blend values with blend parameter. Also define settings through lua dict. * Fix some comments on pull request. * Change formatting * Change formatting * Change formatting * Fix pull request comments. * Those are details * Make Mercury great again. * Make Earth great again. * Solve conflict * Test to sometimes use valueblending and sometimes not * Not always use value blending * Update ghoul * Change from auto to explicit type. * Update test for LRU Cache * Include algorithm.
139 lines
6.2 KiB
C++
139 lines
6.2 KiB
C++
/*****************************************************************************************
|
|
* *
|
|
* OpenSpace *
|
|
* *
|
|
* Copyright (c) 2014-2017 *
|
|
* *
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy of this *
|
|
* software and associated documentation files (the "Software"), to deal in the Software *
|
|
* without restriction, including without limitation the rights to use, copy, modify, *
|
|
* merge, publish, distribute, sublicense, and/or sell copies of the Software, and to *
|
|
* permit persons to whom the Software is furnished to do so, subject to the following *
|
|
* conditions: *
|
|
* *
|
|
* The above copyright notice and this permission notice shall be included in all copies *
|
|
* or substantial portions of the Software. *
|
|
* *
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, *
|
|
* INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A *
|
|
* PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT *
|
|
* HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF *
|
|
* CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE *
|
|
* OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *
|
|
****************************************************************************************/
|
|
|
|
#ifndef __OPENSPACE_MODULE_GLOBEBROWSING___MEMORY_AWARE_TILE_CACHE___H__
|
|
#define __OPENSPACE_MODULE_GLOBEBROWSING___MEMORY_AWARE_TILE_CACHE___H__
|
|
|
|
#include <modules/globebrowsing/cache/lrucache.h>
|
|
#include <modules/globebrowsing/cache/texturecontainer.h>
|
|
#include <modules/globebrowsing/tile/tile.h>
|
|
#include <modules/globebrowsing/tile/tileindex.h>
|
|
#include <modules/globebrowsing/tile/rawtile.h>
|
|
#include <modules/globebrowsing/tile/rawtiledatareader/iodescription.h>
|
|
|
|
#include <openspace/properties/propertyowner.h>
|
|
#include <openspace/properties/scalar/boolproperty.h>
|
|
#include <openspace/properties/scalarproperty.h>
|
|
#include <openspace/properties/triggerproperty.h>
|
|
|
|
#include <memory>
|
|
#include <vector>
|
|
#include <unordered_map>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
namespace cache {
|
|
|
|
struct ProviderTileKey {
|
|
TileIndex tileIndex;
|
|
unsigned int providerID;
|
|
|
|
bool operator==(const ProviderTileKey& r) const {
|
|
return (providerID == r.providerID) &&
|
|
(tileIndex == r.tileIndex);
|
|
}
|
|
};
|
|
|
|
struct ProviderTileHasher {
|
|
/**
|
|
Creates a hash which can be used as key in hash maps.
|
|
First set the bits to be unique for all tiles.
|
|
+-------+------------+-------+------------+
|
|
| USAGE | BIT RANGE | #BITS | MAX VALUE |
|
|
+-------+------------+-------+------------+
|
|
| level | 0 - 5 | 5 | 31 |
|
|
| x | 5 - 35 | 30 | 1073741824 |
|
|
| y | 35 - 64 | 29 | 536870912 |
|
|
+-------+------------+-------+------------+
|
|
|
|
Bits are then shifted depending on the tile provider used.
|
|
*/
|
|
unsigned long long operator()(const ProviderTileKey& t) const {
|
|
unsigned long long key = 0;
|
|
key |= static_cast<unsigned long long>(t.tileIndex.level);
|
|
key |= static_cast<unsigned long long>(t.tileIndex.x) << 5ULL;
|
|
key |= static_cast<unsigned long long>(t.tileIndex.y) << 35ULL;
|
|
// Now the key is unique for all tiles, however not for all tile providers.
|
|
// Add to the key depending on the tile provider to avoid some hash collisions.
|
|
// (All hash collisions can not be avoided due to the limit in 64 bit for the
|
|
// hash key)
|
|
// Idea: make some offset in the place of the bits for the x value. Lesser chance
|
|
// of having different x-value than having different tile provider ids.
|
|
key += static_cast<unsigned long long>(t.providerID) << 25ULL;
|
|
return key;
|
|
}
|
|
};
|
|
|
|
class MemoryAwareTileCache : public properties::PropertyOwner {
|
|
public:
|
|
|
|
MemoryAwareTileCache();
|
|
~MemoryAwareTileCache();
|
|
|
|
void clear();
|
|
void setSizeEstimated(size_t estimatedSize);
|
|
bool exist(ProviderTileKey key) const;
|
|
Tile get(ProviderTileKey key);
|
|
ghoul::opengl::Texture* getTexture(const TileTextureInitData& initData);
|
|
void createTileAndPut(ProviderTileKey key, std::shared_ptr<RawTile> rawTile);
|
|
void put(const ProviderTileKey& key,
|
|
const TileTextureInitData::HashKey& initDataKey, Tile tile);
|
|
void update();
|
|
|
|
size_t getGPUAllocatedDataSize() const;
|
|
size_t getCPUAllocatedDataSize() const;
|
|
bool shouldUsePbo() const;
|
|
|
|
private:
|
|
|
|
void createDefaultTextureContainers();
|
|
void assureTextureContainerExists(const TileTextureInitData& initData);
|
|
void resetTextureContainerSize(size_t numTexturesPerTextureType);
|
|
|
|
using TileCache = LRUCache<ProviderTileKey, Tile, ProviderTileHasher>;
|
|
using TextureContainerTileCache =
|
|
std::pair<std::unique_ptr<TextureContainer>, std::unique_ptr<TileCache>>;
|
|
using TextureContainerMap = std::unordered_map<TileTextureInitData::HashKey,
|
|
TextureContainerTileCache>;
|
|
|
|
TextureContainerMap _textureContainerMap;
|
|
size_t _numTextureBytesAllocatedOnCPU;
|
|
|
|
// Properties
|
|
properties::IntProperty _cpuAllocatedTileData;
|
|
properties::IntProperty _gpuAllocatedTileData;
|
|
properties::IntProperty _tileCacheSize;
|
|
properties::TriggerProperty _applyTileCacheSize;
|
|
properties::TriggerProperty _clearTileCache;
|
|
|
|
/// Whether or not pixel buffer objects should be used when uploading tile data
|
|
properties::BoolProperty _usePbo;
|
|
};
|
|
|
|
} // namespace cache
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|
|
|
|
#endif // __OPENSPACE_MODULE_GLOBEBROWSING___MEMORY_AWARE_TILE_CACHE___H__
|