mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-13 23:40:27 -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.
164 lines
6.7 KiB
C++
164 lines
6.7 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. *
|
|
****************************************************************************************/
|
|
|
|
#include <ghoul/misc/assert.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
namespace cache {
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
LRUCache<KeyType, ValueType, HasherType>::LRUCache(size_t size)
|
|
: _maximumCacheSize(size)
|
|
{}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
void LRUCache<KeyType, ValueType, HasherType>::clear() {
|
|
_itemList.clear();
|
|
_itemMap.clear();
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
void LRUCache<KeyType, ValueType, HasherType>::put(const KeyType& key,
|
|
const ValueType& value)
|
|
{
|
|
putWithoutCleaning(key, value);
|
|
clean();
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
std::vector<std::pair<KeyType, ValueType>>
|
|
LRUCache<KeyType, ValueType, HasherType>::putAndFetchPopped(const KeyType& key,
|
|
const ValueType& value)
|
|
{
|
|
putWithoutCleaning(key, value);
|
|
return cleanAndFetchPopped();
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
bool LRUCache<KeyType, ValueType, HasherType>::exist(const KeyType& key) const {
|
|
return _itemMap.count(key) > 0;
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
bool LRUCache<KeyType, ValueType, HasherType>::touch(const KeyType& key) {
|
|
auto it = _itemMap.find(key);
|
|
if (it != _itemMap.end()) { // Found in cache
|
|
ValueType value = it->second->second;
|
|
// Remove from current position
|
|
_itemList.erase(it->second);
|
|
_itemMap.erase(it);
|
|
// Bump to front
|
|
_itemList.emplace_front(key, value);
|
|
_itemMap.emplace(key, _itemList.begin());
|
|
return true;
|
|
} else {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
bool LRUCache<KeyType, ValueType, HasherType>::isEmpty() const {
|
|
return _itemMap.size() == 0;
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
ValueType LRUCache<KeyType, ValueType, HasherType>::get(const KeyType& key) {
|
|
//ghoul_assert(exist(key), "Key " << key << " must exist");
|
|
auto it = _itemMap.find(key);
|
|
// Move list iterator pointing to value
|
|
_itemList.splice(_itemList.begin(), _itemList, it->second);
|
|
return it->second->second;
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
std::pair<KeyType, ValueType> LRUCache<KeyType, ValueType, HasherType>::popMRU() {
|
|
ghoul_assert(_itemList.size() > 0,
|
|
"Can not pop from LRU cache. Ensure cache is not empty.");
|
|
auto first_it = _itemList.begin();
|
|
_itemMap.erase(first_it->first);
|
|
std::pair<KeyType, ValueType> toReturn = _itemList.front();
|
|
_itemList.pop_front();
|
|
return toReturn;
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
std::pair<KeyType, ValueType> LRUCache<KeyType, ValueType, HasherType>::popLRU() {
|
|
ghoul_assert(_itemList.size() > 0,
|
|
"Can not pop from LRU cache. Ensure cache is not empty.");
|
|
auto lastIt = _itemList.end();
|
|
lastIt--;
|
|
_itemMap.erase(lastIt->first);
|
|
std::pair<KeyType, ValueType> toReturn = _itemList.back();
|
|
_itemList.pop_back();
|
|
return toReturn;
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
size_t LRUCache<KeyType, ValueType, HasherType>::size() const {
|
|
return _itemMap.size();
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
void LRUCache<KeyType, ValueType, HasherType>::putWithoutCleaning(const KeyType& key,
|
|
const ValueType& value)
|
|
{
|
|
auto it = _itemMap.find(key);
|
|
if (it != _itemMap.end()) {
|
|
_itemList.erase(it->second);
|
|
_itemMap.erase(it);
|
|
}
|
|
_itemList.emplace_front(key, value);
|
|
_itemMap.emplace(key, _itemList.begin());
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
void LRUCache<KeyType, ValueType, HasherType>::clean() {
|
|
while (_itemMap.size() > _maximumCacheSize) {
|
|
auto lastIt = _itemList.end();
|
|
lastIt--;
|
|
_itemMap.erase(lastIt->first);
|
|
_itemList.pop_back();
|
|
}
|
|
}
|
|
|
|
template<typename KeyType, typename ValueType, typename HasherType>
|
|
std::vector<std::pair<KeyType, ValueType>>
|
|
LRUCache<KeyType, ValueType, HasherType>::cleanAndFetchPopped()
|
|
{
|
|
std::vector<std::pair<KeyType, ValueType>> toReturn;
|
|
while (_itemMap.size() > _maximumCacheSize) {
|
|
auto lastIt = _itemList.end();
|
|
lastIt--;
|
|
_itemMap.erase(lastIt->first);
|
|
toReturn.push_back(_itemList.back());
|
|
_itemList.pop_back();
|
|
}
|
|
return toReturn;
|
|
}
|
|
|
|
} // namespace cache
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|