Xargon/Supermodel
1
0
Fork 0
mirror of https://github.com/RetroDECK/Supermodel.git synced 2025-02-18 10:15:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Just use 1 hash map for the textures, instead of 1 for each format. Should greatly speed up texture invalidation. TODO invalidate texture mipmaps .. the h/w actually seems to stream the mipmap data separate from the base textures in some cases.

Browse source
This commit is contained in:
Ian Curtis 2017-03-24 20:54:12 +00:00
parent 98d56ff011
commit 06c1cdcf94
2 changed files with 12 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
Src/Graphics/New3D/TextureSheet.cpp
View file

@ -31,14 +31,14 @@ std::shared_ptr<Texture> TextureSheet::BindTexture(const UINT16* src, int format
index = ToIndex(x, y); index = ToIndex(x, y);
auto range = m_texMap[format].equal_range(index); auto range = m_texMap.equal_range(index);
if (range.first == range.second) { if (range.first == range.second) {
// nothing found so create a new texture // nothing found so create a new texture
std::shared_ptr<Texture> t(new Texture()); std::shared_ptr<Texture> t(new Texture());
m_texMap[format].insert(std::pair<int, std::shared_ptr<Texture>>(index, t)); m_texMap.insert(std::pair<int, std::shared_ptr<Texture>>(index, t));
t->UploadTexture(src, m_temp.data(), format, mirrorU, mirrorV, x, y, width, height); t->UploadTexture(src, m_temp.data(), format, mirrorU, mirrorV, x, y, width, height);
return t; return t;
} }
@ -52,7 +52,7 @@ std::shared_ptr<Texture> TextureSheet::BindTexture(const UINT16* src, int format
it->second->GetDetails(x2, y2, width2, height2, format2); it->second->GetDetails(x2, y2, width2, height2, format2);
if (width == width2 && height == height2) { if (width == width2 && height == height2 && format == format2) {
return it->second; return it->second;
} }
} }
@ -60,7 +60,7 @@ std::shared_ptr<Texture> TextureSheet::BindTexture(const UINT16* src, int format
// nothing found so create a new entry // nothing found so create a new entry
std::shared_ptr<Texture> t(new Texture()); std::shared_ptr<Texture> t(new Texture());
m_texMap[format].insert(std::pair<int, std::shared_ptr<Texture>>(index, t)); m_texMap.insert(std::pair<int, std::shared_ptr<Texture>>(index, t));
t->UploadTexture(src, m_temp.data(), format, mirrorU, mirrorV, x, y, width, height); t->UploadTexture(src, m_temp.data(), format, mirrorU, mirrorV, x, y, width, height);
return t; return t;
} }
@ -68,9 +68,7 @@ std::shared_ptr<Texture> TextureSheet::BindTexture(const UINT16* src, int format
void TextureSheet::Release() void TextureSheet::Release()
{ {
for (int i = 0; i < 12; i++) { m_texMap.clear();
m_texMap[i].clear();
}
} }
void TextureSheet::Invalidate(int x, int y, int width, int height) void TextureSheet::Invalidate(int x, int y, int width, int height)
@ -116,23 +114,17 @@ void TextureSheet::Invalidate(int x, int y, int width, int height)
int index = ToIndex(posX, posY); int index = ToIndex(posX, posY);
if (posX >= x && posY >= y) { // invalidate this area of memory if (posX >= x && posY >= y) { // invalidate this area of memory
for (int j = 0; j < 12; j++) { m_texMap.erase(index);
m_texMap[j].erase(index);
}
} }
else { // check for overlapping data tiles and invalidate as necessary else { // check for overlapping data tiles and invalidate as necessary
for (int j = 0; j < 12; j++) { auto range = m_texMap.equal_range(index);
auto range = m_texMap[j].equal_range(index); for (auto it = range.first; it != range.second; ++it) {
for (auto it = range.first; it != range.second; ++it) {
if (it->second->CheckMapPos(x, x + width, y, y + height)) {
m_texMap[j].erase(index);
break;
}
if (it->second->CheckMapPos(x, x + width, y, y + height)) {
m_texMap.erase(index);
break;
} }
} }
} }

2
Src/Graphics/New3D/TextureSheet.h
View file

@ -25,7 +25,7 @@ private:
int ToIndex(int x, int y); int ToIndex(int x, int y);
void CropTile(int oldX, int oldY, int &newX, int &newY, int &newWidth, int &newHeight); void CropTile(int oldX, int oldY, int &newX, int &newY, int &newWidth, int &newHeight);
std::unordered_multimap<int, std::shared_ptr<Texture>> m_texMap[12]; std::unordered_multimap<int, std::shared_ptr<Texture>> m_texMap;
// the key for the above maps is the x/y position in the 2048x2048 texture // the key for the above maps is the x/y position in the 2048x2048 texture
// array of 8 planes for each texture type // array of 8 planes for each texture type