mirror of
https://github.com/OpenSpace/OpenSpace.git
synced 2026-01-10 13:41:45 -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.
153 lines
6.0 KiB
C++
153 lines
6.0 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 <modules/globebrowsing/tile/tiletextureinitdata.h>
|
|
#include <modules/globebrowsing/tile/rawtiledatareader/tiledatatype.h>
|
|
|
|
namespace openspace {
|
|
namespace globebrowsing {
|
|
|
|
const glm::ivec2 TileTextureInitData::tilePixelStartOffset = glm::ivec2(-2);
|
|
const glm::ivec2 TileTextureInitData::tilePixelSizeDifference = glm::ivec2(4);
|
|
|
|
TileTextureInitData::TileTextureInitData(size_t width, size_t height, GLuint glType,
|
|
Format textureFormat, ShouldAllocateDataOnCPU shouldAllocateDataOnCPU)
|
|
: _glType(glType)
|
|
, _ghoulTextureFormat(textureFormat)
|
|
, _shouldAllocateDataOnCPU(shouldAllocateDataOnCPU)
|
|
{
|
|
_dimensionsWithoutPadding = glm::ivec3(width, height, 1);
|
|
_dimensionsWithPadding = glm::ivec3(
|
|
width + tilePixelSizeDifference.x, height + tilePixelSizeDifference.y, 1);
|
|
_nRasters = tiledatatype::numberOfRasters(_ghoulTextureFormat);
|
|
_bytesPerDatum = tiledatatype::numberOfBytes(glType);
|
|
_bytesPerPixel = _nRasters * _bytesPerDatum;
|
|
_bytesPerLine = _bytesPerPixel * _dimensionsWithPadding.x;
|
|
_totalNumBytes = _bytesPerLine * _dimensionsWithPadding.y;
|
|
_glTextureFormat = tiledatatype::glTextureFormat(_glType,
|
|
_ghoulTextureFormat);
|
|
calculateHashKey();
|
|
};
|
|
|
|
TileTextureInitData::TileTextureInitData(const TileTextureInitData& original)
|
|
: TileTextureInitData(
|
|
original.dimensionsWithoutPadding().x,
|
|
original.dimensionsWithoutPadding().y,
|
|
original.glType(),
|
|
original.ghoulTextureFormat(),
|
|
original.shouldAllocateDataOnCPU() ? ShouldAllocateDataOnCPU::Yes : ShouldAllocateDataOnCPU::No)
|
|
{ };
|
|
|
|
glm::ivec3 TileTextureInitData::dimensionsWithPadding() const {
|
|
return _dimensionsWithPadding;
|
|
}
|
|
|
|
glm::ivec3 TileTextureInitData::dimensionsWithoutPadding() const {
|
|
return _dimensionsWithoutPadding;
|
|
}
|
|
|
|
size_t TileTextureInitData::nRasters() const {
|
|
return _nRasters;
|
|
}
|
|
|
|
size_t TileTextureInitData::bytesPerDatum() const {
|
|
return _bytesPerDatum;
|
|
}
|
|
|
|
size_t TileTextureInitData::bytesPerPixel() const {
|
|
return _bytesPerPixel;
|
|
}
|
|
|
|
size_t TileTextureInitData::bytesPerLine() const {
|
|
return _bytesPerLine;
|
|
}
|
|
|
|
size_t TileTextureInitData::totalNumBytes() const {
|
|
return _totalNumBytes;
|
|
}
|
|
|
|
GLuint TileTextureInitData::glType() const {
|
|
return _glType;
|
|
}
|
|
|
|
TileTextureInitData::Format TileTextureInitData::ghoulTextureFormat() const {
|
|
return _ghoulTextureFormat;
|
|
}
|
|
|
|
GLint TileTextureInitData::glTextureFormat() const {
|
|
return _glTextureFormat;
|
|
}
|
|
|
|
bool TileTextureInitData::shouldAllocateDataOnCPU() const {
|
|
return _shouldAllocateDataOnCPU;
|
|
}
|
|
|
|
TileTextureInitData::HashKey TileTextureInitData::hashKey() const {
|
|
return _hashKey;
|
|
}
|
|
|
|
void TileTextureInitData::calculateHashKey() {
|
|
ghoul_assert(_dimensionsWithoutPadding.x > 0, "Incorrect dimension");
|
|
ghoul_assert(_dimensionsWithoutPadding.y > 0, "Incorrect dimension");
|
|
ghoul_assert(_dimensionsWithoutPadding.x <= 1024, "Incorrect dimension");
|
|
ghoul_assert(_dimensionsWithoutPadding.y <= 1024, "Incorrect dimension");
|
|
ghoul_assert(_dimensionsWithoutPadding.z == 1, "Incorrect dimension");
|
|
unsigned int format = getUniqueIdFromTextureFormat(_ghoulTextureFormat);
|
|
ghoul_assert(format < 256, "Incorrect format");
|
|
|
|
_hashKey = 0LL;
|
|
|
|
_hashKey |= _dimensionsWithoutPadding.x;
|
|
_hashKey |= _dimensionsWithoutPadding.y << 10;
|
|
_hashKey |= _glType << (10 + 16);
|
|
_hashKey |= format << (10 + 16 + 4);
|
|
};
|
|
|
|
unsigned int TileTextureInitData::getUniqueIdFromTextureFormat(
|
|
Format textureFormat) const
|
|
{
|
|
using Format = Format;
|
|
switch (textureFormat) {
|
|
case Format::Red:
|
|
return 0;
|
|
case Format::RG:
|
|
return 1;
|
|
case Format::RGB:
|
|
return 2;
|
|
case Format::BGR:
|
|
return 3;
|
|
case Format::RGBA:
|
|
return 4;
|
|
case Format::BGRA:
|
|
return 5;
|
|
case Format::DepthComponent:
|
|
return 6;
|
|
default:
|
|
ghoul_assert(false, "Unknown texture format");
|
|
}
|
|
}
|
|
|
|
} // namespace globebrowsing
|
|
} // namespace openspace
|