Merge branch 'topic/drawable-fixes' into topic/drawable (#1560)
Co-authored-by: Stefan Karschti <stefan.karschti@gmail.com> Co-authored-by: Alex Cristici <alex.cristici@gmail.com> Co-authored-by: Tim Sylvester <tim@wetdogweather.com> Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
This commit is contained in:
@@ -107,11 +107,6 @@ const gfx::Texture2DPtr& RenderTile::getGlyphAtlasTexture() const {
|
||||
return renderData ? renderData->getGlyphAtlasTexture() : noTexture;
|
||||
}
|
||||
|
||||
gfx::TextureBinding RenderTile::getGlyphAtlasTextureBinding(gfx::TextureFilterType filter) const {
|
||||
assert(renderData && renderData->getGlyphAtlasTexture());
|
||||
return {getGlyphAtlasTexture()->getResource(), filter};
|
||||
}
|
||||
|
||||
bool RenderTile::hasIconAtlasTexture() const {
|
||||
return renderData && renderData->getIconAtlasTexture();
|
||||
}
|
||||
@@ -120,11 +115,6 @@ const gfx::Texture2DPtr& RenderTile::getIconAtlasTexture() const {
|
||||
return renderData ? renderData->getIconAtlasTexture() : noTexture;
|
||||
}
|
||||
|
||||
gfx::TextureBinding RenderTile::getIconAtlasTextureBinding(gfx::TextureFilterType filter) const {
|
||||
assert(renderData && renderData->getIconAtlasTexture());
|
||||
return {getIconAtlasTexture()->getResource(), filter};
|
||||
}
|
||||
|
||||
static const std::shared_ptr<TileAtlasTextures> noAtlas;
|
||||
const std::shared_ptr<TileAtlasTextures>& RenderTile::getAtlasTextures() const {
|
||||
return renderData ? renderData->getAtlasTextures() : noAtlas;
|
||||
|
||||
Reference in New Issue
Block a user