kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Vulkan Refactoring - Eliminated KRTextureManager::m_boundTextures and KRTextureManager::m_boundTextureHandles

Browse Source
This commit is contained in:
Kearwood Gilbert
2022-09-19 00:04:03 -07:00
parent be6c3a148e
commit d50b7f7831
2 changed files with 3 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
kraken/KRTextureManager.cpp
View File

@@ -44,10 +44,6 @@ KRTextureManager::KRTextureManager(KRContext& context) : KRResourceManager(conte
{ {
m_textureMemUsed = 0; m_textureMemUsed = 0;
for (int iTexture = 0; iTexture < KRENGINE_MAX_TEXTURE_UNITS; iTexture++) {
m_boundTextures[iTexture] = NULL;
m_boundTextureHandles[iTexture] = 0;
}
m_memoryTransferredThisFrame = 0; m_memoryTransferredThisFrame = 0;
m_streamerComplete = true; m_streamerComplete = true;
@@ -231,14 +227,8 @@ KRTexture* KRTextureManager::getTexture(const std::string& name)
bool KRTextureManager::selectTexture(GLenum target, int iTextureUnit, int iTextureHandle) bool KRTextureManager::selectTexture(GLenum target, int iTextureUnit, int iTextureHandle)
{ {
if (m_boundTextureHandles[iTextureUnit] != iTextureHandle) { // TODO - Vulkan Refactoring
m_boundTextureHandles[iTextureUnit] = iTextureHandle; return true;
_setActiveTexture(iTextureUnit);
glBindTexture(target, iTextureHandle);
return true;
} else {
return false;
}
} }
long KRTextureManager::getMemUsed() long KRTextureManager::getMemUsed()
@@ -298,11 +288,7 @@ void KRTextureManager::startFrame(float deltaTime)
void KRTextureManager::endFrame(float deltaTime) void KRTextureManager::endFrame(float deltaTime)
{ {
for (int iTexture = 0; iTexture < KRENGINE_MAX_TEXTURE_UNITS; iTexture++) {
if (m_boundTextures[iTexture]) {
m_boundTextures[iTexture]->resetPoolExpiry(0.0f, KRTexture::TEXTURE_USAGE_NONE); // Even if the same texture is bound, ensure that they don't expire from the texture pool while in use
}
}
} }
void KRTextureManager::doStreaming(long& memoryRemaining, long& memoryRemainingThisFrame) void KRTextureManager::doStreaming(long& memoryRemaining, long& memoryRemainingThisFrame)

3
kraken/KRTextureManager.h
View File

@@ -92,11 +92,8 @@ private:
unordered_map<std::string, KRTexture*> m_textures; unordered_map<std::string, KRTexture*> m_textures;
KRTexture* m_boundTextures[KRENGINE_MAX_TEXTURE_UNITS];
int m_boundTextureHandles[KRENGINE_MAX_TEXTURE_UNITS];
float m_maxAnisotropy; float m_maxAnisotropy;
std::set<KRTexture*> m_activeTextures; std::set<KRTexture*> m_activeTextures;
std::vector<std::pair<float, KRTexture*> > m_activeTextures_streamer; std::vector<std::pair<float, KRTexture*> > m_activeTextures_streamer;